nx 20.5.0-rc.4 → 20.6.0-beta.0

package/.eslintrc.json

@@ -131,8 +131,10 @@
               "@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/powerpack-conformance",
+              "@nx/conformance"
             ]
           }
         ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.5.0-rc.4",
+  "version": "20.6.0-beta.0",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -82,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "20.5.0-rc.4",
-    "@nx/nx-darwin-x64": "20.5.0-rc.4",
-    "@nx/nx-freebsd-x64": "20.5.0-rc.4",
-    "@nx/nx-linux-arm-gnueabihf": "20.5.0-rc.4",
-    "@nx/nx-linux-arm64-gnu": "20.5.0-rc.4",
-    "@nx/nx-linux-arm64-musl": "20.5.0-rc.4",
-    "@nx/nx-linux-x64-gnu": "20.5.0-rc.4",
-    "@nx/nx-linux-x64-musl": "20.5.0-rc.4",
-    "@nx/nx-win32-arm64-msvc": "20.5.0-rc.4",
-    "@nx/nx-win32-x64-msvc": "20.5.0-rc.4"
+    "@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-migrations": {
     "migrations": "./migrations.json",

package/src/adapter/compat.d.ts

@@ -1,2 +1,2 @@
 export declare const allowedProjectExtensions: readonly ["tags", "implicitDependencies", "configFilePath", "$schema", "generators", "namedInputs", "name", "files", "root", "sourceRoot", "projectType", "release", "includedScripts", "metadata"];
-export declare const allowedWorkspaceExtensions: readonly ["$schema", "implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudId", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins", "neverConnectToCloud", "sync", "useLegacyCache"];
+export declare const allowedWorkspaceExtensions: readonly ["$schema", "implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudId", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins", "neverConnectToCloud", "sync", "useLegacyCache", "maxCacheSize"];

package/src/adapter/compat.js

@@ -65,6 +65,7 @@ exports.allowedWorkspaceExtensions = [
     'neverConnectToCloud',
     'sync',
     'useLegacyCache',
+    'maxCacheSize',
 ];
 if (!patched) {
     Module.prototype.require = function () {

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,25 @@
+"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/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[];

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

@@ -21,7 +21,7 @@ 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 nxPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(__dirname, '../../../package.json'));
 exports.packagesWeCareAbout = [
     'lerna',
@@ -46,7 +46,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, } = await getReportData();
     const fields = [
         ['Node', process.versions.node],
         ['OS', `${process.platform}-${process.arch}`],
@@ -61,29 +61,29 @@ 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'));
-        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 {
-                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.`);
+        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 {
-                bodyLines.push(`License expired on ${licenseExpiryDate.toLocaleDateString()}.`);
+                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('');
@@ -94,11 +94,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) {
@@ -165,20 +165,20 @@ 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;
         }
     }
     return {
         pm,
-        powerpackLicense,
-        powerpackError,
+        nxKey,
+        nxKeyError,
         powerpackPlugins,
         pmVersion,
         localPlugins,
@@ -256,7 +256,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/config/nx-json.d.ts

@@ -490,6 +490,10 @@ export interface NxJsonConfiguration<T = '*' | string[]> {
      * Use the legacy file system cache instead of the db cache
      */
     useLegacyCache?: boolean;
+    /**
+     * Sets the maximum size of the local cache. Accepts a number followed by a unit (e.g. 100MB). Accepted units are B, KB, MB, and GB.
+     */
+    maxCacheSize?: string;
 }
 export type PluginConfiguration = string | ExpandedPluginConfiguration;
 export type ExpandedPluginConfiguration<T = unknown> = {