nx 20.5.0-rc.3 → 20.5.0-rc.4

package/.eslintrc.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.5.0-rc.3",
+  "version": "20.5.0-rc.4",
   "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.3",
-    "@nx/nx-darwin-x64": "20.5.0-rc.3",
-    "@nx/nx-freebsd-x64": "20.5.0-rc.3",
-    "@nx/nx-linux-arm-gnueabihf": "20.5.0-rc.3",
-    "@nx/nx-linux-arm64-gnu": "20.5.0-rc.3",
-    "@nx/nx-linux-arm64-musl": "20.5.0-rc.3",
-    "@nx/nx-linux-x64-gnu": "20.5.0-rc.3",
-    "@nx/nx-linux-x64-musl": "20.5.0-rc.3",
-    "@nx/nx-win32-arm64-msvc": "20.5.0-rc.3",
-    "@nx/nx-win32-x64-msvc": "20.5.0-rc.3"
+    "@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-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-key/activate-key.js → activate-powerpack/activate-powerpack.js}

@@ -1,33 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleActivateKey = handleActivateKey;
+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 handleActivateKey(options) {
-    const key = options.key ??
+async function handleActivatePowerpack(options) {
+    const license = options.license ??
         (await (0, enquirer_1.prompt)({
             type: 'input',
-            name: 'key',
-            message: 'Enter your key',
+            name: 'license',
+            message: 'Enter your License Key',
         }));
-    const { activateNxKey } = await requireNxKey();
-    activateNxKey(workspace_root_1.workspaceRoot, key);
+    const { activatePowerpack } = await requirePowerpack();
+    activatePowerpack(workspace_root_1.workspaceRoot, license);
 }
-async function requireNxKey() {
+async function requirePowerpack() {
     // @ts-ignore
-    return Promise.resolve().then(() => require('@nx/key')).catch(async (e) => {
+    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/key@latest`, {
+                (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/key'));
+                return await Promise.resolve().then(() => require('@nx/powerpack-license'));
             }
             catch (e) {
-                throw new Error('Failed to install @nx/key. Please install @nx/key and try again.');
+                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/{activate-key → activate-powerpack}/command-object.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.yargsActivateKeyCommand = void 0;
+exports.yargsActivatePowerpackCommand = void 0;
 const shared_options_1 = require("../yargs-utils/shared-options");
 const handle_errors_1 = require("../../utils/handle-errors");
-exports.yargsActivateKeyCommand = {
-    command: 'activate-key <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)
@@ -13,14 +12,14 @@ exports.yargsActivateKeyCommand = {
         '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 activate-key <key>', 'Activate 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, async () => {
-            return (await Promise.resolve().then(() => require('./activate-key'))).handleActivateKey(args);
+            return (await Promise.resolve().then(() => require('./activate-powerpack'))).handleActivatePowerpack(args);
         });
         process.exit(exitCode);
     },

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

@@ -12,9 +12,9 @@ const package_manager_1 = require("../../utils/package-manager");
 const output_1 = require("../../utils/output");
 const workspace_root_1 = require("../../utils/workspace-root");
 const utils_1 = require("./implementation/utils");
-const plugins_1 = require("../../utils/plugins");
 const angular_json_1 = require("../../adapter/angular-json");
 const error_types_1 = require("../../project-graph/error-types");
+const generator_utils_1 = require("../generate/generator-utils");
 function runPackageManagerInstallPlugins(repoRoot, pmc = (0, package_manager_1.getPackageManagerCommand)(), plugins) {
     if (plugins.length === 0) {
         return;
@@ -32,23 +32,21 @@ function runPackageManagerInstallPlugins(repoRoot, pmc = (0, package_manager_1.g
  * @returns void
  */
 async function installPlugin(plugin, repoRoot = workspace_root_1.workspaceRoot, updatePackageScripts = false, verbose = false, pmc = (0, package_manager_1.getPackageManagerCommand)()) {
-    const capabilities = await (0, plugins_1.getPluginCapabilities)(repoRoot, plugin, {});
-    const generators = capabilities?.generators;
-    if (!generators) {
-        throw new Error(`No generators found in ${plugin}.`);
+    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' : ''}`, {
+            stdio: [0, 1, 2],
+            cwd: repoRoot,
+            windowsHide: false,
+        });
     }
-    const initGenerator = findInitGenerator(generators);
-    if (!initGenerator) {
+    catch {
+        // init generator does not exist, so this function should noop
         output_1.output.log({
             title: `No "init" generator found in ${plugin}. Skipping initialization.`,
         });
         return;
     }
-    (0, child_process_1.execSync)(`${pmc.exec} nx g ${plugin}:init --keepExistingVersions ${updatePackageScripts ? '--updatePackageScripts' : ''} ${verbose ? '--verbose' : ''}`, {
-        stdio: [0, 1, 2],
-        cwd: repoRoot,
-        windowsHide: false,
-    });
 }
 /**
  * Install plugins

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-key/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.yargsActivateKeyCommand)
+    .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[];

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 nx_key_1 = require("../../utils/nx-key");
+const powerpack_1 = require("../../utils/powerpack");
 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, 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, } = await getReportData();
     const fields = [
         ['Node', process.versions.node],
         ['OS', `${process.platform}-${process.arch}`],
@@ -61,31 +61,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(`Licensed to ${nxKey.organizationName} for ${nxKey.seatCount} user${nxKey.seatCount > 1 ? 's' : ''} in ${nxKey.workspaceCount === 9999
+        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'
-            : nxKey.workspaceCount} workspace${nxKey.workspaceCount > 1 ? 's' : ''}.`);
-        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()}.`);
-                }
+            : 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('');
@@ -96,11 +94,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) {
@@ -167,20 +165,20 @@ 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;
         }
     }
     return {
         pm,
-        nxKey,
-        nxKeyError,
+        powerpackLicense,
+        powerpackError,
         powerpackPlugins,
         pmVersion,
         localPlugins,
@@ -258,7 +256,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)();