nx 20.6.0-beta.0 → 20.6.0-beta.1

package/.eslintrc.json

@@ -131,10 +131,8 @@
               "@nx/nx-win32-arm64-msvc",
               "@nx/nx-freebsd-x64",
               "@nx/powerpack-license",
-              "@nx/key",
               // Powerpack plugin conditionally available dynamically at runtime
-              "@nx/powerpack-conformance",
-              "@nx/conformance"
+              "@nx/powerpack-conformance"
             ]
           }
         ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.6.0-beta.0",
+  "version": "20.6.0-beta.1",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -38,7 +38,7 @@
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.2",
     "@zkochan/js-yaml": "0.0.7",
-    "axios": "^1.7.4",
+    "axios": "^1.8.3",
     "chalk": "^4.1.0",
     "cli-cursor": "3.1.0",
     "cli-spinners": "2.6.1",
@@ -82,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "20.6.0-beta.0",
-    "@nx/nx-darwin-x64": "20.6.0-beta.0",
-    "@nx/nx-freebsd-x64": "20.6.0-beta.0",
-    "@nx/nx-linux-arm-gnueabihf": "20.6.0-beta.0",
-    "@nx/nx-linux-arm64-gnu": "20.6.0-beta.0",
-    "@nx/nx-linux-arm64-musl": "20.6.0-beta.0",
-    "@nx/nx-linux-x64-gnu": "20.6.0-beta.0",
-    "@nx/nx-linux-x64-musl": "20.6.0-beta.0",
-    "@nx/nx-win32-arm64-msvc": "20.6.0-beta.0",
-    "@nx/nx-win32-x64-msvc": "20.6.0-beta.0"
+    "@nx/nx-darwin-arm64": "20.6.0-beta.1",
+    "@nx/nx-darwin-x64": "20.6.0-beta.1",
+    "@nx/nx-freebsd-x64": "20.6.0-beta.1",
+    "@nx/nx-linux-arm-gnueabihf": "20.6.0-beta.1",
+    "@nx/nx-linux-arm64-gnu": "20.6.0-beta.1",
+    "@nx/nx-linux-arm64-musl": "20.6.0-beta.1",
+    "@nx/nx-linux-x64-gnu": "20.6.0-beta.1",
+    "@nx/nx-linux-x64-musl": "20.6.0-beta.1",
+    "@nx/nx-win32-arm64-msvc": "20.6.0-beta.1",
+    "@nx/nx-win32-x64-msvc": "20.6.0-beta.1"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/activate-powerpack/activate-powerpack.d.ts

@@ -0,0 +1,2 @@
+import { ActivatePowerpackOptions } from './command-object';
+export declare function handleActivatePowerpack(options: ActivatePowerpackOptions): Promise<void>;

package/src/command-line/activate-powerpack/activate-powerpack.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleActivatePowerpack = handleActivatePowerpack;
+const workspace_root_1 = require("../../utils/workspace-root");
+const enquirer_1 = require("enquirer");
+const child_process_1 = require("child_process");
+const package_manager_1 = require("../../utils/package-manager");
+async function handleActivatePowerpack(options) {
+    const license = options.license ??
+        (await (0, enquirer_1.prompt)({
+            type: 'input',
+            name: 'license',
+            message: 'Enter your License Key',
+        }));
+    const { activatePowerpack } = await requirePowerpack();
+    activatePowerpack(workspace_root_1.workspaceRoot, license);
+}
+async function requirePowerpack() {
+    // @ts-ignore
+    return Promise.resolve().then(() => require('@nx/powerpack-license')).catch(async (e) => {
+        if ('code' in e && e.code === 'MODULE_NOT_FOUND') {
+            try {
+                (0, child_process_1.execSync)(`${(0, package_manager_1.getPackageManagerCommand)().addDev} @nx/powerpack-license@latest`, {
+                    windowsHide: false,
+                });
+                // @ts-ignore
+                return await Promise.resolve().then(() => require('@nx/powerpack-license'));
+            }
+            catch (e) {
+                throw new Error('Failed to install @nx/powerpack-license. Please install @nx/powerpack-license and try again.');
+            }
+        }
+    });
+}

package/src/command-line/activate-powerpack/command-object.d.ts

@@ -0,0 +1,6 @@
+import { CommandModule } from 'yargs';
+export interface ActivatePowerpackOptions {
+    license: string;
+    verbose: boolean;
+}
+export declare const yargsActivatePowerpackCommand: CommandModule<{}, ActivatePowerpackOptions>;

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

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

package/src/command-line/init/configure-plugins.js

@@ -33,8 +33,15 @@ function runPackageManagerInstallPlugins(repoRoot, pmc = (0, package_manager_1.g
  */
 async function installPlugin(plugin, repoRoot = workspace_root_1.workspaceRoot, updatePackageScripts = false, verbose = false, pmc = (0, package_manager_1.getPackageManagerCommand)()) {
     try {
-        (0, generator_utils_1.getGeneratorInformation)(plugin, 'init', workspace_root_1.workspaceRoot, {});
-        (0, child_process_1.execSync)(`${pmc.exec} nx g ${plugin}:init --keepExistingVersions ${updatePackageScripts ? '--updatePackageScripts' : ''} ${verbose ? '--verbose' : ''}`, {
+        const { schema } = (0, generator_utils_1.getGeneratorInformation)(plugin, 'init', workspace_root_1.workspaceRoot, {});
+        let command = `${pmc.exec} nx g ${plugin}:init ${verbose ? '--verbose' : ''}`;
+        if (!!schema.properties['keepExistingVersions']) {
+            command += ` --keepExistingVersions`;
+        }
+        if (updatePackageScripts && !!schema.properties['updatePackageScripts']) {
+            command += ` --updatePackageScripts`;
+        }
+        (0, child_process_1.execSync)(command, {
             stdio: [0, 1, 2],
             cwd: repoRoot,
             windowsHide: false,

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

@@ -156,6 +156,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("./register/command-object");
+const command_object_1 = require("./activate-powerpack/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.yargsRegisterCommand)
+    .command(command_object_1.yargsActivatePowerpackCommand)
     .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 Nx key and the \`@nx/conformance\` plugin installed.`,
+                    `In order to use the \`nx ${command}\` command you must have an active Powerpack license and the \`@nx/powerpack-conformance\` plugin installed.`,
                     '',
                     'To learn more, visit https://nx.dev/nx-enterprise/powerpack/conformance',
                 ],
@@ -110,14 +110,7 @@ function createMissingConformanceCommand(command) {
 }
 function resolveConformanceCommandObject() {
     try {
-        const { yargsConformanceCommand } = (() => {
-            try {
-                return require('@nx/powerpack-conformance');
-            }
-            catch {
-                return require('@nx/conformance');
-            }
-        })();
+        const { yargsConformanceCommand } = require('@nx/powerpack-conformance');
         return yargsConformanceCommand;
     }
     catch {
@@ -126,14 +119,7 @@ function resolveConformanceCommandObject() {
 }
 function resolveConformanceCheckCommandObject() {
     try {
-        const { yargsConformanceCheckCommand } = (() => {
-            try {
-                return require('@nx/powerpack-conformance');
-            }
-            catch {
-                return require('@nx/conformance');
-            }
-        })();
+        const { yargsConformanceCheckCommand, } = require('@nx/powerpack-conformance');
         return yargsConformanceCheckCommand;
     }
     catch {

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 NxKey } from '@nx/key';
+import type { PowerpackLicense } from '@nx/powerpack-license';
 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;
-    nxKey: NxKey | null;
-    nxKeyError: Error | null;
+    powerpackLicense: PowerpackLicense | null;
+    powerpackError: 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 nx_key_1 = require("../../utils/nx-key");
+const powerpack_1 = require("../../utils/powerpack");
+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, nxKey, nxKeyError, localPlugins, powerpackPlugins, communityPlugins, registeredPlugins, packageVersionsWeCareAbout, outOfSyncPackageGroup, projectGraphError, nativeTarget, } = await getReportData();
+    const { pm, pmVersion, powerpackLicense, powerpackError, localPlugins, powerpackPlugins, communityPlugins, registeredPlugins, packageVersionsWeCareAbout, outOfSyncPackageGroup, projectGraphError, nativeTarget, cache, } = await getReportData();
     const fields = [
         ['Node', process.versions.node],
         ['OS', `${process.platform}-${process.arch}`],
@@ -61,29 +64,29 @@ async function reportHandler() {
     packageVersionsWeCareAbout.forEach((p) => {
         bodyLines.push(`${chalk.green(p.package.padEnd(padding))} : ${chalk.bold(p.version)}`);
     });
-    if (nxKey) {
+    if (powerpackLicense) {
         bodyLines.push('');
         bodyLines.push(LINE_SEPARATOR);
-        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()}.`);
-                }
+        bodyLines.push(chalk.green('Nx Powerpack'));
+        const licenseExpiryDate = new Date((powerpackLicense.realExpiresAt ?? powerpackLicense.expiresAt) * 1000);
+        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' : ''}.`);
+        // license is not expired
+        if (licenseExpiryDate.getTime() >= Date.now()) {
+            if ('perpetualNxVersion' in powerpackLicense) {
+                bodyLines.push(`License expires on ${licenseExpiryDate.toLocaleDateString()}, but will continue to work with Nx ${powerpackLicense.perpetualNxVersion} and below.`);
             }
             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(`License expires on ${licenseExpiryDate.toLocaleDateString()}.`);
+            }
+        }
+        else {
+            if ('perpetualNxVersion' in powerpackLicense) {
+                bodyLines.push(`License expired on ${licenseExpiryDate.toLocaleDateString()}, but will continue to work with Nx ${powerpackLicense.perpetualNxVersion} and below.`);
+            }
+            else {
+                bodyLines.push(`License expired on ${licenseExpiryDate.toLocaleDateString()}.`);
             }
         }
         bodyLines.push('');
@@ -94,11 +97,11 @@ async function reportHandler() {
         }
         bodyLines.push('');
     }
-    else if (nxKeyError) {
+    else if (powerpackError) {
         bodyLines.push('');
-        bodyLines.push(chalk.red('Nx key'));
+        bodyLines.push(chalk.red('Nx Powerpack'));
         bodyLines.push(LINE_SEPARATOR);
-        bodyLines.push(nxKeyError.message);
+        bodyLines.push(powerpackError.message);
         bodyLines.push('');
     }
     if (registeredPlugins.length) {
@@ -123,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}`);
@@ -165,20 +172,28 @@ async function getReportData() {
     }
     const outOfSyncPackageGroup = findMisalignedPackagesForPackage(nxPackageJson);
     const native = isNativeAvailable();
-    let nxKey = null;
-    let nxKeyError = null;
+    let powerpackLicense = null;
+    let powerpackError = null;
     try {
-        nxKey = await (0, nx_key_1.getNxKeyInformation)();
+        powerpackLicense = await (0, powerpack_1.getPowerpackLicenseInformation)();
     }
     catch (e) {
-        if (!(e instanceof nx_key_1.NxKeyNotInstalledError)) {
-            nxKeyError = e;
+        if (!(e instanceof powerpack_1.NxPowerpackNotInstalledError)) {
+            powerpackError = 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,
-        nxKey,
-        nxKeyError,
+        powerpackLicense,
+        powerpackError,
         powerpackPlugins,
         pmVersion,
         localPlugins,
@@ -188,6 +203,7 @@ async function getReportData() {
         outOfSyncPackageGroup,
         projectGraphError,
         nativeTarget: native ? native.getBinaryTarget() : null,
+        cache,
     };
 }
 async function tryGetProjectGraph() {
@@ -256,7 +272,7 @@ function findMisalignedPackagesForPackage(base) {
 }
 function findInstalledPowerpackPlugins() {
     const installedPlugins = (0, installed_plugins_1.findInstalledPlugins)();
-    return installedPlugins.filter((dep) => new RegExp('@nx/powerpack*|@nx/(.+)-cache|@nx/(conformance|owners|enterprise*)').test(dep.name));
+    return installedPlugins.filter((dep) => new RegExp('@nx/powerpack*').test(dep.name));
 }
 function findInstalledCommunityPlugins() {
     const installedPlugins = (0, installed_plugins_1.findInstalledPlugins)();

package/src/native/index.d.ts

@@ -42,6 +42,7 @@ export declare class NxCache {
   put(hash: string, terminalOutput: string, outputs: Array<string>, code: number): void
   applyRemoteCacheResults(hash: string, result: CachedResult, outputs: Array<string>): void
   getTaskOutputsPath(hash: string): string
+  getCacheSize(): number
   copyFilesFromCache(cachedResult: CachedResult, outputs: Array<string>): number
   removeOldCacheRecords(): void
   checkCacheFsInSync(): boolean
@@ -166,6 +167,8 @@ export declare export function findImports(projectFileMap: Record<string, Array<
 
 export declare export function getBinaryTarget(): string
 
+export declare export function getDefaultMaxCacheSize(cachePath: string): number
+
 /**
  * Expands the given outputs into a list of existing files.
  * This is used when hashing outputs

package/src/native/native-bindings.js

@@ -379,6 +379,7 @@ module.exports.EventType = nativeBinding.EventType
 module.exports.expandOutputs = nativeBinding.expandOutputs
 module.exports.findImports = nativeBinding.findImports
 module.exports.getBinaryTarget = nativeBinding.getBinaryTarget
+module.exports.getDefaultMaxCacheSize = nativeBinding.getDefaultMaxCacheSize
 module.exports.getFilesForOutputs = nativeBinding.getFilesForOutputs
 module.exports.getTransformableOutputs = nativeBinding.getTransformableOutputs
 module.exports.hashArray = nativeBinding.hashArray

package/src/tasks-runner/cache.d.ts

@@ -26,6 +26,7 @@ export declare class DbCache {
     });
     init(): Promise<void>;
     get(task: Task): Promise<CachedResult | null>;
+    getUsedCacheSpace(): number;
     private applyRemoteCacheResults;
     put(task: Task, terminalOutput: string | null, outputs: string[], code: number): Promise<void>;
     copyFilesFromCache(_: string, cachedResult: CachedResult, outputs: string[]): Promise<number>;
@@ -33,11 +34,11 @@ export declare class DbCache {
     temporaryOutputPath(task: Task): string;
     private getRemoteCache;
     private _getRemoteCache;
-    private getS3Cache;
-    private getSharedCache;
-    private getGcsCache;
-    private getAzureCache;
-    private resolveRemoteCache;
+    private getPowerpackS3Cache;
+    private getPowerpackSharedCache;
+    private getPowerpackGcsCache;
+    private getPowerpackAzureCache;
+    private getPowerpackCache;
     private resolvePackage;
     private assertCacheIsValid;
 }
@@ -76,4 +77,5 @@ export declare class Cache {
  *
  * @param maxCacheSize Max cache size as specified in nx.json
  */
-export declare function parseMaxCacheSize(maxCacheSize: string): number | undefined;
+export declare function parseMaxCacheSize(maxCacheSize: string | number): number | undefined;
+export declare function formatCacheSize(maxCacheSize: number, decimals?: number): string;

package/src/tasks-runner/cache.js

@@ -4,6 +4,7 @@ exports.Cache = exports.DbCache = void 0;
 exports.dbCacheEnabled = dbCacheEnabled;
 exports.getCache = getCache;
 exports.parseMaxCacheSize = parseMaxCacheSize;
+exports.formatCacheSize = formatCacheSize;
 const workspace_root_1 = require("../utils/workspace-root");
 const path_1 = require("path");
 const perf_hooks_1 = require("perf_hooks");
@@ -70,7 +71,9 @@ class DbCache {
     constructor(options) {
         this.options = options;
         this.nxJson = (0, nx_json_1.readNxJson)();
-        this.cache = new native_1.NxCache(workspace_root_1.workspaceRoot, cache_directory_1.cacheDir, (0, db_connection_1.getDbConnection)(), undefined, parseMaxCacheSize(this.nxJson.maxCacheSize));
+        this.cache = new native_1.NxCache(workspace_root_1.workspaceRoot, cache_directory_1.cacheDir, (0, db_connection_1.getDbConnection)(), undefined, this.nxJson.maxCacheSize !== undefined
+            ? parseMaxCacheSize(this.nxJson.maxCacheSize)
+            : (0, native_1.getDefaultMaxCacheSize)(cache_directory_1.cacheDir));
         this.isVerbose = process.env.NX_VERBOSE_LOGGING === 'true';
     }
     async init() {
@@ -107,6 +110,9 @@ class DbCache {
             return null;
         }
     }
+    getUsedCacheSpace() {
+        return this.cache.getCacheSize();
+    }
     applyRemoteCacheResults(hash, res, outputs) {
         return this.cache.applyRemoteCacheResults(hash, res, outputs);
     }
@@ -157,38 +163,26 @@ class DbCache {
             }
         }
         else {
-            return ((await this.getS3Cache()) ??
-                (await this.getSharedCache()) ??
-                (await this.getGcsCache()) ??
-                (await this.getAzureCache()) ??
+            return ((await this.getPowerpackS3Cache()) ??
+                (await this.getPowerpackSharedCache()) ??
+                (await this.getPowerpackGcsCache()) ??
+                (await this.getPowerpackAzureCache()) ??
                 null);
         }
     }
-    async getS3Cache() {
-        const cache = await this.resolveRemoteCache('@nx/s3-cache');
-        if (cache)
-            return cache;
-        return this.resolveRemoteCache('@nx/powerpack-s3-cache');
-    }
-    async getSharedCache() {
-        const cache = await this.resolveRemoteCache('@nx/shared-fs-cache');
-        if (cache)
-            return cache;
-        return this.resolveRemoteCache('@nx/powerpack-shared-fs-cache');
-    }
-    async getGcsCache() {
-        const cache = await this.resolveRemoteCache('@nx/gcs-cache');
-        if (cache)
-            return cache;
-        return this.resolveRemoteCache('@nx/powerpack-gcs-cache');
-    }
-    async getAzureCache() {
-        const cache = await this.resolveRemoteCache('@nx/azure-cache');
-        if (cache)
-            return cache;
-        return this.resolveRemoteCache('@nx/powerpack-azure-cache');
-    }
-    async resolveRemoteCache(pkg) {
+    getPowerpackS3Cache() {
+        return this.getPowerpackCache('@nx/powerpack-s3-cache');
+    }
+    getPowerpackSharedCache() {
+        return this.getPowerpackCache('@nx/powerpack-shared-fs-cache');
+    }
+    getPowerpackGcsCache() {
+        return this.getPowerpackCache('@nx/powerpack-gcs-cache');
+    }
+    getPowerpackAzureCache() {
+        return this.getPowerpackCache('@nx/powerpack-azure-cache');
+    }
+    async getPowerpackCache(pkg) {
         let getRemoteCache = null;
         try {
             getRemoteCache = (await Promise.resolve(`${this.resolvePackage(pkg)}`).then(s => require(s))).getRemoteCache;
@@ -479,10 +473,14 @@ function tryAndRetry(fn) {
  * @param maxCacheSize Max cache size as specified in nx.json
  */
 function parseMaxCacheSize(maxCacheSize) {
-    if (!maxCacheSize) {
+    if (maxCacheSize === null || maxCacheSize === undefined) {
         return undefined;
     }
-    let regexResult = maxCacheSize.match(/^(?<size>[\d|.]+)\s?((?<unit>[KMG]?B)?)$/);
+    let regexResult = maxCacheSize
+        // Covers folks who accidentally specify as a number rather than a string
+        .toString()
+        // Match a number followed by an optional unit (KB, MB, GB), with optional whitespace between the number and unit
+        .match(/^(?<size>[\d|.]+)\s?((?<unit>[KMG]?B)?)$/);
     if (!regexResult) {
         throw new Error(`Invalid max cache size specified in nx.json: ${maxCacheSize}. Must be a number followed by an optional unit (KB, MB, GB)`);
     }
@@ -506,3 +504,13 @@ function parseMaxCacheSize(maxCacheSize) {
             return size;
     }
 }
+function formatCacheSize(maxCacheSize, decimals = 2) {
+    const exponents = ['B', 'KB', 'MB', 'GB'];
+    let exponent = 0;
+    let size = maxCacheSize;
+    while (size >= 1024 && exponent < exponents.length - 1) {
+        size /= 1024;
+        exponent++;
+    }
+    return `${size.toFixed(decimals)} ${exponents[exponent]}`;
+}

package/src/tasks-runner/run-command.js

@@ -36,7 +36,7 @@ const task_results_life_cycle_1 = require("./life-cycles/task-results-life-cycle
 const task_graph_utils_1 = require("./task-graph-utils");
 const utils_1 = require("./utils");
 const chalk = require("chalk");
-const nx_key_1 = require("../utils/nx-key");
+const powerpack_1 = require("../utils/powerpack");
 const tasks_execution_hooks_1 = require("../project-graph/plugins/tasks-execution-hooks");
 async function getTerminalOutputLifeCycle(initiatingProject, projectNames, tasks, nxArgs, nxJson, overrides) {
     const { runnerOptions } = getRunner(nxArgs, nxJson);
@@ -141,7 +141,7 @@ async function runCommandForTasks(projectsToRun, currentProjectGraph, { nxJson }
         initiatingProject,
     });
     await renderIsDone;
-    await (0, nx_key_1.printNxKey)();
+    await (0, powerpack_1.printPowerpackLicense)();
     return taskResults;
 }
 async function ensureWorkspaceIsInSyncAndGetGraphs(projectGraph, nxJson, projectNames, nxArgs, overrides, extraTargetDependencies, extraOptions) {

package/src/utils/powerpack.d.ts

@@ -0,0 +1,5 @@
+export declare function printPowerpackLicense(): Promise<void>;
+export declare function getPowerpackLicenseInformation(): Promise<import("@nx/powerpack-license").PowerpackLicense>;
+export declare class NxPowerpackNotInstalledError extends Error {
+    constructor(e: Error);
+}

package/src/utils/powerpack.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NxPowerpackNotInstalledError = void 0;
+exports.printPowerpackLicense = printPowerpackLicense;
+exports.getPowerpackLicenseInformation = getPowerpackLicenseInformation;
+const logger_1 = require("./logger");
+const package_manager_1 = require("./package-manager");
+const workspace_root_1 = require("./workspace-root");
+async function printPowerpackLicense() {
+    try {
+        const { organizationName, seatCount, workspaceCount } = await getPowerpackLicenseInformation();
+        logger_1.logger.log(`Nx Powerpack Licensed to ${organizationName} for ${seatCount} user${seatCount > 1 ? 's' : ''} in ${workspaceCount === 9999 ? 'an unlimited number of' : workspaceCount} workspace${workspaceCount > 1 ? 's' : ''}`);
+    }
+    catch { }
+}
+async function getPowerpackLicenseInformation() {
+    try {
+        const { getPowerpackLicenseInformation, getPowerpackLicenseInformationAsync, } = (await Promise.resolve().then(() => require('@nx/powerpack-license')));
+        return (getPowerpackLicenseInformationAsync ?? getPowerpackLicenseInformation)(workspace_root_1.workspaceRoot);
+    }
+    catch (e) {
+        if ('code' in e && e.code === 'MODULE_NOT_FOUND') {
+            throw new NxPowerpackNotInstalledError(e);
+        }
+        throw e;
+    }
+}
+class NxPowerpackNotInstalledError extends Error {
+    constructor(e) {
+        super(`The "@nx/powerpack-license" package is needed to use Nx Powerpack enabled features. Please install the @nx/powerpack-license with ${(0, package_manager_1.getPackageManagerCommand)().addDev} @nx/powerpack-license`, { cause: e });
+    }
+}
+exports.NxPowerpackNotInstalledError = NxPowerpackNotInstalledError;

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

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

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

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

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

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleRegister = handleRegister;
-const workspace_root_1 = require("../../utils/workspace-root");
-const enquirer_1 = require("enquirer");
-const require_nx_key_1 = require("../../utils/require-nx-key");
-async function handleRegister(options) {
-    const nxKey = await (0, require_nx_key_1.requireNxKey)();
-    // If a key was provided through options, activate it directly
-    if (options.key) {
-        return nxKey.activateNxKey(workspace_root_1.workspaceRoot, options.key);
-    }
-    // Try to auto-register a key
-    const generatedKey = await nxKey.autoRegisterNxKey(workspace_root_1.workspaceRoot);
-    if (generatedKey) {
-        return;
-    }
-    // If auto-registration was skipped, prompt for a key
-    const { key } = await (0, enquirer_1.prompt)({
-        type: 'input',
-        name: 'key',
-        message: 'Enter your key',
-    });
-    return nxKey.activateNxKey(workspace_root_1.workspaceRoot, key);
-}

package/src/utils/nx-key.d.ts

@@ -1,7 +0,0 @@
-import type { NxKey } from '@nx/key';
-export declare function createNxKeyLicenseeInformation(nxKey: NxKey): string;
-export declare function printNxKey(): Promise<void>;
-export declare function getNxKeyInformation(): Promise<NxKey | null>;
-export declare class NxKeyNotInstalledError extends Error {
-    constructor(e: Error);
-}

package/src/utils/nx-key.js

@@ -1,52 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NxKeyNotInstalledError = void 0;
-exports.createNxKeyLicenseeInformation = createNxKeyLicenseeInformation;
-exports.printNxKey = printNxKey;
-exports.getNxKeyInformation = getNxKeyInformation;
-const logger_1 = require("./logger");
-const package_manager_1 = require("./package-manager");
-const workspace_root_1 = require("./workspace-root");
-function createNxKeyLicenseeInformation(nxKey) {
-    if ('isPowerpack' in nxKey && nxKey.isPowerpack) {
-        return `Licensed to ${nxKey.organizationName} for ${nxKey.seatCount} user${nxKey.seatCount > 1 ? 's' : ''} in ${nxKey.workspaceCount === 9999
-            ? 'an unlimited number of'
-            : nxKey.workspaceCount} workspace${nxKey.workspaceCount > 1 ? 's' : ''}.`;
-    }
-    else {
-        return `Licensed to ${nxKey.organizationName}.`;
-    }
-}
-async function printNxKey() {
-    try {
-        const key = await getNxKeyInformation();
-        if (key) {
-            logger_1.logger.log(createNxKeyLicenseeInformation(key));
-        }
-    }
-    catch { }
-}
-async function getNxKeyInformation() {
-    try {
-        const { getPowerpackLicenseInformation, getPowerpackLicenseInformationAsync, } = (await Promise.resolve().then(() => require('@nx/powerpack-license')));
-        return (getPowerpackLicenseInformationAsync ?? getPowerpackLicenseInformation)(workspace_root_1.workspaceRoot);
-    }
-    catch (e) {
-        try {
-            const { getNxKeyInformationAsync } = (await Promise.resolve().then(() => require('@nx/key')));
-            return getNxKeyInformationAsync(workspace_root_1.workspaceRoot);
-        }
-        catch (e) {
-            if ('code' in e && e.code === 'MODULE_NOT_FOUND') {
-                throw new NxKeyNotInstalledError(e);
-            }
-            throw e;
-        }
-    }
-}
-class NxKeyNotInstalledError extends Error {
-    constructor(e) {
-        super(`The "@nx/key" package is needed to use Nx key enabled features. Please install it with ${(0, package_manager_1.getPackageManagerCommand)().addDev} @nx/key`, { cause: e });
-    }
-}
-exports.NxKeyNotInstalledError = NxKeyNotInstalledError;

package/src/utils/require-nx-key.d.ts

@@ -1 +0,0 @@
-export declare function requireNxKey(): Promise<typeof import('@nx/key')>;

package/src/utils/require-nx-key.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.requireNxKey = requireNxKey;
-const child_process_1 = require("child_process");
-const package_manager_1 = require("./package-manager");
-async function requireNxKey() {
-    // @ts-ignore
-    return Promise.resolve().then(() => require('@nx/key')).catch(async (e) => {
-        if ('code' in e && e.code === 'MODULE_NOT_FOUND') {
-            try {
-                (0, child_process_1.execSync)(`${(0, package_manager_1.getPackageManagerCommand)().addDev} @nx/key@latest`, {
-                    windowsHide: false,
-                });
-                // @ts-ignore
-                return await Promise.resolve().then(() => require('@nx/key'));
-            }
-            catch (e) {
-                throw new Error('Failed to install @nx/key. Please install @nx/key and try again.');
-            }
-        }
-    });
-}