nx 20.5.0-rc.1 → 20.5.0-rc.3

package/.eslintrc.json

@@ -131,6 +131,7 @@
               "@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.1",
+  "version": "20.5.0-rc.3",
   "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.1",
-    "@nx/nx-darwin-x64": "20.5.0-rc.1",
-    "@nx/nx-freebsd-x64": "20.5.0-rc.1",
-    "@nx/nx-linux-arm-gnueabihf": "20.5.0-rc.1",
-    "@nx/nx-linux-arm64-gnu": "20.5.0-rc.1",
-    "@nx/nx-linux-arm64-musl": "20.5.0-rc.1",
-    "@nx/nx-linux-x64-gnu": "20.5.0-rc.1",
-    "@nx/nx-linux-x64-musl": "20.5.0-rc.1",
-    "@nx/nx-win32-arm64-msvc": "20.5.0-rc.1",
-    "@nx/nx-win32-x64-msvc": "20.5.0-rc.1"
+    "@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-migrations": {
     "migrations": "./migrations.json",

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

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

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

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

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

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

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

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.yargsActivatePowerpackCommand = void 0;
+exports.yargsActivateKeyCommand = 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.yargsActivateKeyCommand = {
+    command: 'activate-key <key>',
+    aliases: ['activate-powerpack'],
     describe: false,
     // describe: 'Activate a Nx Powerpack license.',
     builder: (yargs) => (0, shared_options_1.withVerbose)(yargs)
@@ -12,14 +13,14 @@ exports.yargsActivatePowerpackCommand = {
         '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 activate-key <key>', 'Activate 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);
+            return (await Promise.resolve().then(() => require('./activate-key'))).handleActivateKey(args);
         });
         process.exit(exitCode);
     },

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("./activate-key/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.yargsActivateKeyCommand)
     .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/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,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'));
-        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
+        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
             ? '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.`);
+            : 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()}.`);
+                }
             }
             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 +96,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 +167,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 +258,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/project-graph.d.ts

@@ -74,6 +74,7 @@ export interface ProjectGraphProjectNode {
         description?: string;
     };
 }
+export declare function isProjectGraphProjectNode(node: ProjectGraphProjectNode | ProjectGraphExternalNode): node is ProjectGraphProjectNode;
 /**
  * A node describing an external dependency
  * `name` has as form of:
@@ -85,14 +86,15 @@ export interface ProjectGraphProjectNode {
  *
  */
 export interface ProjectGraphExternalNode {
-    type: 'npm';
-    name: `npm:${string}`;
+    type: string;
+    name: string;
     data: {
         version: string;
         packageName: string;
         hash?: string;
     };
 }
+export declare function isProjectGraphExternalNode(node: ProjectGraphProjectNode | ProjectGraphExternalNode): node is ProjectGraphExternalNode;
 /**
  * A dependency between two projects
  */

package/src/config/project-graph.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DependencyType = void 0;
 exports.fileDataDepTarget = fileDataDepTarget;
 exports.fileDataDepType = fileDataDepType;
+exports.isProjectGraphProjectNode = isProjectGraphProjectNode;
+exports.isProjectGraphExternalNode = isProjectGraphExternalNode;
 function fileDataDepTarget(dep) {
     return typeof dep === 'string'
         ? dep
@@ -35,3 +37,9 @@ var DependencyType;
      */
     DependencyType["implicit"] = "implicit";
 })(DependencyType || (exports.DependencyType = DependencyType = {}));
+function isProjectGraphProjectNode(node) {
+    return node.type === 'app' || node.type === 'e2e' || node.type === 'lib';
+}
+function isProjectGraphExternalNode(node) {
+    return isProjectGraphProjectNode(node) === false;
+}

package/src/daemon/server/logger.js

@@ -10,6 +10,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serverLogger = void 0;
+const versions_1 = require("../../utils/versions");
 class ServerLogger {
     log(...s) {
         console.log(this.formatLogMessage(`${s
@@ -28,7 +29,7 @@ class ServerLogger {
         this.log(`[WATCHER]: ${s.join(' ')}`);
     }
     formatLogMessage(message) {
-        return `[NX Daemon Server] - ${this.getNow()} - ${message}`;
+        return `[NX v${versions_1.nxVersion} Daemon Server] - ${this.getNow()} - ${message}`;
     }
     getNow() {
         return new Date(Date.now()).toISOString();

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

@@ -32,11 +32,11 @@ export declare class DbCache {
     temporaryOutputPath(task: Task): string;
     private getRemoteCache;
     private _getRemoteCache;
-    private getPowerpackS3Cache;
-    private getPowerpackSharedCache;
-    private getPowerpackGcsCache;
-    private getPowerpackAzureCache;
-    private getPowerpackCache;
+    private getS3Cache;
+    private getSharedCache;
+    private getGcsCache;
+    private getAzureCache;
+    private resolveRemoteCache;
     private resolvePackage;
     private assertCacheIsValid;
 }

package/src/tasks-runner/cache.js

@@ -155,26 +155,38 @@ class DbCache {
             }
         }
         else {
-            return ((await this.getPowerpackS3Cache()) ??
-                (await this.getPowerpackSharedCache()) ??
-                (await this.getPowerpackGcsCache()) ??
-                (await this.getPowerpackAzureCache()) ??
+            return ((await this.getS3Cache()) ??
+                (await this.getSharedCache()) ??
+                (await this.getGcsCache()) ??
+                (await this.getAzureCache()) ??
                 null);
         }
     }
-    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) {
+    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) {
         let getRemoteCache = null;
         try {
             getRemoteCache = (await Promise.resolve(`${this.resolvePackage(pkg)}`).then(s => require(s))).getRemoteCache;

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 powerpack_1 = require("../utils/powerpack");
+const nx_key_1 = require("../utils/nx-key");
 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, powerpack_1.printPowerpackLicense)();
+    await (0, nx_key_1.printNxKey)();
     return taskResults;
 }
 async function ensureWorkspaceIsInSyncAndGetGraphs(projectGraph, nxJson, projectNames, nxArgs, overrides, extraTargetDependencies, extraOptions) {

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

@@ -0,0 +1,5 @@
+export declare function printNxKey(): Promise<void>;
+export declare function getNxKeyInformation(): Promise<any>;
+export declare class NxKeyNotInstalledError extends Error {
+    constructor(e: Error);
+}

package/src/utils/nx-key.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NxKeyNotInstalledError = void 0;
+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");
+async function printNxKey() {
+    try {
+        const { organizationName, seatCount, workspaceCount } = await getNxKeyInformation();
+        logger_1.logger.log(`Nx key licensed to ${organizationName} for ${seatCount} user${seatCount > 1 ? 's' : ''} in ${workspaceCount === 9999 ? 'an unlimited number of' : workspaceCount} workspace${workspaceCount > 1 ? 's' : ''}`);
+    }
+    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/command-line/activate-powerpack/activate-powerpack.d.ts

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

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

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

package/src/utils/powerpack.d.ts

@@ -1,5 +0,0 @@
-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

@@ -1,33 +0,0 @@
-"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;