Revert "feat(core): add activate key (#30250)" (#30295)

Author: Cammisuli

package.json

@@ -78,12 +78,11 @@
     "@nx/eslint-plugin": "20.5.0-rc.3",
     "@nx/jest": "20.5.0-rc.3",
     "@nx/js": "20.5.0-rc.3",
-    "@nx/key": "1.3.0-beta.1",
     "@nx/next": "20.5.0-rc.3",
     "@nx/playwright": "20.5.0-rc.3",
-    "@nx/powerpack-conformance": "1.3.0-beta.1",
-    "@nx/powerpack-enterprise-cloud": "1.3.0-beta.1",
-    "@nx/powerpack-license": "1.3.0-beta.1",
+    "@nx/powerpack-conformance": "1.2.5",
+    "@nx/powerpack-enterprise-cloud": "1.2.5",
+    "@nx/powerpack-license": "1.2.5",
     "@nx/react": "20.5.0-rc.3",
     "@nx/rsbuild": "20.5.0-rc.3",
     "@nx/rspack": "20.5.0-rc.3",

packages/nx/.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"
             ]

packages/nx/src/command-line/activate-key/activate-key.ts

@@ -0,0 +1,42 @@
+import { workspaceRoot } from '../../utils/workspace-root';
+import { ActivatePowerpackOptions } from './command-object';
+import { prompt } from 'enquirer';
+import { execSync } from 'child_process';
+import { getPackageManagerCommand } from '../../utils/package-manager';
+
+export async function handleActivatePowerpack(
+  options: ActivatePowerpackOptions
+) {
+  const license =
+    options.license ??
+    (await prompt({
+      type: 'input',
+      name: 'license',
+      message: 'Enter your License Key',
+    }));
+  const { activatePowerpack } = await requirePowerpack();
+  activatePowerpack(workspaceRoot, license);
+}
+
+async function requirePowerpack(): Promise<any> {
+  // @ts-ignore
+  return import('@nx/powerpack-license').catch(async (e) => {
+    if ('code' in e && e.code === 'MODULE_NOT_FOUND') {
+      try {
+        execSync(
+          `${getPackageManagerCommand().addDev} @nx/powerpack-license@latest`,
+          {
+            windowsHide: false,
+          }
+        );
+
+        // @ts-ignore
+        return await import('@nx/powerpack-license');
+      } catch (e) {
+        throw new Error(
+          'Failed to install @nx/powerpack-license. Please install @nx/powerpack-license and try again.'
+        );
+      }
+    }
+  });
+}

packages/nx/src/command-line/activate-powerpack/activate-powerpack.ts

@@ -2,14 +2,16 @@ import { CommandModule } from 'yargs';
 import { withVerbose } from '../yargs-utils/shared-options';
 import { handleErrors } from '../../utils/handle-errors';
 
-export interface ActivateKeyOptions {
-  key: string;
+export interface ActivatePowerpackOptions {
+  license: string;
   verbose: boolean;
 }
 
-export const yargsActivateKeyCommand: CommandModule<{}, ActivateKeyOptions> = {
-  command: 'activate-key <key>',
-  aliases: ['activate-powerpack'],
+export const yargsActivatePowerpackCommand: CommandModule<
+  {},
+  ActivatePowerpackOptions
+> = {
+  command: 'activate-powerpack <license>',
   describe: false,
   // describe: 'Activate a Nx Powerpack license.',
   builder: (yargs) =>
@@ -18,14 +20,19 @@ export const yargsActivateKeyCommand: CommandModule<{}, ActivateKeyOptions> = {
         '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 handleErrors(args.verbose as boolean, async () => {
-      return (await import('./activate-key')).handleActivateKey(args);
+      return (await import('./activate-powerpack')).handleActivatePowerpack(
+        args
+      );
     });
     process.exit(exitCode);
   },

packages/nx/src/command-line/activate-key/command-object.ts renamed to packages/nx/src/command-line/activate-powerpack/command-object.ts

@@ -1,7 +1,7 @@
 import * as chalk from 'chalk';
 import * as yargs from 'yargs';
 
-import { yargsActivateKeyCommand } from './activate-key/command-object';
+import { yargsActivatePowerpackCommand } from './activate-powerpack/command-object';
 import {
   yargsAffectedBuildCommand,
   yargsAffectedCommand,
@@ -65,7 +65,7 @@ export const commandsObject = yargs
   .parserConfiguration(parserConfiguration)
   .usage(chalk.bold('Smart Monorepos · Fast CI'))
   .demandCommand(1, '')
-  .command(yargsActivateKeyCommand)
+  .command(yargsActivatePowerpackCommand)
   .command(yargsAddCommand)
   .command(yargsAffectedBuildCommand)
   .command(yargsAffectedCommand)
@@ -121,7 +121,7 @@ function createMissingConformanceCommand(
       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',
         ],
@@ -133,13 +133,7 @@ function createMissingConformanceCommand(
 
 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 {
     return createMissingConformanceCommand('conformance');
@@ -148,13 +142,9 @@ 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 {
     return createMissingConformanceCommand('conformance:check');

packages/nx/src/command-line/nx-commands.ts

@@ -24,10 +24,10 @@ import { NxJsonConfiguration, readNxJson } from '../../config/nx-json';
 import { ProjectGraph } from '../../config/project-graph';
 import { ProjectGraphError } from '../../project-graph/error-types';
 import {
-  getNxKeyInformation,
-  NxKeyNotInstalledError,
-} from '../../utils/nx-key';
-import { type NxKey } from '@nx/key';
+  getPowerpackLicenseInformation,
+  NxPowerpackNotInstalledError,
+} from '../../utils/powerpack';
+import type { PowerpackLicense } from '@nx/powerpack-license';
 
 const nxPackageJson = readJsonFile<typeof import('../../../package.json')>(
   join(__dirname, '../../../package.json')
@@ -64,8 +64,8 @@ export async function reportHandler() {
   const {
     pm,
     pmVersion,
-    nxKey,
-    nxKeyError,
+    powerpackLicense,
+    powerpackError,
     localPlugins,
     powerpackPlugins,
     communityPlugins,
@@ -97,51 +97,49 @@ export async function reportHandler() {
     );
   });
 
-  if (nxKey) {
+  if (powerpackLicense) {
     bodyLines.push('');
     bodyLines.push(LINE_SEPARATOR);
-    bodyLines.push(chalk.green('Nx key licensed packages'));
+    bodyLines.push(chalk.green('Nx Powerpack'));
+
+    const licenseExpiryDate = new Date(
+      (powerpackLicense.realExpiresAt ?? powerpackLicense.expiresAt) * 1000
+    );
 
     bodyLines.push(
-      `Licensed to ${nxKey.organizationName} for ${nxKey.seatCount} user${
-        nxKey.seatCount > 1 ? 's' : ''
-      } in ${
-        nxKey.workspaceCount === 9999
+      `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' : ''}.`
+          : powerpackLicense.workspaceCount
+      } workspace${powerpackLicense.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()}.`
-          );
-        }
+    // 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()}.`
+        );
       }
     }
 
@@ -161,11 +159,11 @@ export 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('');
   }
 
@@ -228,8 +226,8 @@ export async function reportHandler() {
 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[];
@@ -278,20 +276,20 @@ export async function getReportData(): Promise<ReportData> {
 
   const native = isNativeAvailable();
 
-  let nxKey = null;
-  let nxKeyError = null;
+  let powerpackLicense = null;
+  let powerpackError = null;
   try {
-    nxKey = await getNxKeyInformation();
+    powerpackLicense = await getPowerpackLicenseInformation();
   } catch (e) {
-    if (!(e instanceof NxKeyNotInstalledError)) {
-      nxKeyError = e;
+    if (!(e instanceof NxPowerpackNotInstalledError)) {
+      powerpackError = e;
     }
   }
 
   return {
     pm,
-    nxKey,
-    nxKeyError,
+    powerpackLicense,
+    powerpackError,
     powerpackPlugins,
     pmVersion,
     localPlugins,
@@ -395,9 +393,7 @@ export function findMisalignedPackagesForPackage(
 export function findInstalledPowerpackPlugins(): PackageJson[] {
   const installedPlugins = findInstalledPlugins();
   return installedPlugins.filter((dep) =>
-    new RegExp(
-      '@nx/powerpack*|@nx/(.+)-cache|@nx/(conformance|owners|enterprise*)'
-    ).test(dep.name)
+    new RegExp('@nx/powerpack*').test(dep.name)
   );
 }