nx 20.5.0-rc.3 → 20.5.0

package/src/plugins/package-json/create-nodes.js

@@ -86,6 +86,9 @@ function createNodeFromPackageJson(pkgJsonPath, workspaceRoot, cache, isInPackag
         ...json,
         root: projectRoot,
         isInPackageManagerWorkspaces,
+        // change this to bust the cache when making changes that result in different
+        // results for the same hash
+        bust: 1,
     });
     const cached = cache[hash];
     if (cached) {
@@ -126,7 +129,6 @@ function buildProjectConfigurationFromPackageJson(packageJson, workspaceRoot, pa
     let name = packageJson.name ?? (0, to_project_name_1.toProjectName)(normalizedPath);
     const projectConfiguration = {
         root: projectRoot,
-        sourceRoot: projectRoot,
         name,
         ...packageJson.nx,
         targets: (0, package_json_1.readTargetsFromPackageJson)(packageJson, nxJson),

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

@@ -32,11 +32,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;
 }

package/src/tasks-runner/cache.js

@@ -155,38 +155,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;

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/activate-key/activate-key.d.ts

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

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

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

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

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

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