nx 21.0.0-beta.10 → 21.0.0-beta.11

package/src/devkit-exports.d.ts

@@ -13,7 +13,7 @@ export type { WorkspaceJsonConfiguration, ProjectsConfigurations, TargetDependen
 /**
  * @category Workspace
  */
-export type { Generator, GeneratorCallback, PromiseExecutor, AsyncIteratorExecutor, Executor, ExecutorContext, TaskGraphExecutor, GeneratorsJson, ExecutorsJson, MigrationsJson, CustomHasher, HasherContext, } from './config/misc-interfaces';
+export type { Generator, Migration, GeneratorCallback, PromiseExecutor, AsyncIteratorExecutor, Executor, ExecutorContext, TaskGraphExecutor, GeneratorsJson, ExecutorsJson, MigrationsJson, CustomHasher, HasherContext, } from './config/misc-interfaces';
 export { workspaceLayout } from './config/configuration';
 export type { NxPlugin, NxPluginV2, CreateNodes, CreateNodesFunction, CreateNodesResult, CreateNodesContext, CreateNodesContextV2, CreateNodesFunctionV2, CreateNodesResultV2, CreateNodesV2, CreateDependencies, CreateDependenciesContext, CreateMetadata, CreateMetadataContext, ProjectsMetadata, PreTasksExecution, PreTasksExecutionContext, PostTasksExecution, PostTasksExecutionContext, } from './project-graph/plugins';
 export { AggregateCreateNodesError, StaleProjectGraphCacheError, } from './project-graph/error-types';

package/src/migrations/update-21-0-0/remove-custom-tasks-runner.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '../../generators/tree';
+export default function update(tree: Tree): Promise<string[]>;

package/src/migrations/update-21-0-0/remove-custom-tasks-runner.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
+const nx_json_1 = require("../../generators/utils/nx-json");
+function isCustomRunnerPath(modulePath) {
+    return !['nx-cloud', '@nrwl/nx-cloud', 'nx/tasks-runners/default'].includes(modulePath);
+}
+async function update(tree) {
+    const nxJson = (0, nx_json_1.readNxJson)(tree);
+    if (!nxJson?.tasksRunnerOptions) {
+        return;
+    }
+    const nextSteps = [];
+    for (const key in nxJson.tasksRunnerOptions) {
+        const runner = nxJson.tasksRunnerOptions[key].runner;
+        if (runner && isCustomRunnerPath(runner)) {
+            let nextStepText = 'Nx 21 removed support for custom task runners. For more information, please check: ';
+            if (runner === '@nx-aws-cache/nx-aws-cache') {
+                nextStepText +=
+                    'https://nx.dev/deprecated/custom-tasks-runner#migrating-from-nxawsplugin';
+            }
+            else {
+                nextStepText += 'https://nx.dev/deprecated/custom-tasks-runner';
+            }
+            if (nextSteps.length === 0) {
+                nextSteps.push(nextStepText);
+            }
+            delete nxJson.tasksRunnerOptions[key];
+        }
+    }
+    if (Object.keys(nxJson.tasksRunnerOptions).length === 0) {
+        delete nxJson.tasksRunnerOptions;
+    }
+    (0, nx_json_1.updateNxJson)(tree, nxJson);
+    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
+    return nextSteps;
+}

package/src/migrations/update-21-0-0/remove-legacy-cache.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '../../generators/tree';
+export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-21-0-0/remove-legacy-cache.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
+const nx_json_1 = require("../../generators/utils/nx-json");
+async function update(tree) {
+    const nxJson = (0, nx_json_1.readNxJson)(tree);
+    if (!nxJson) {
+        return;
+    }
+    // If workspaces  had `useLegacyCache` we can just delete the property as the property is not functional in nx v21
+    if (nxJson.useLegacyCache) {
+        delete nxJson.useLegacyCache;
+    }
+    (0, nx_json_1.updateNxJson)(tree, nxJson);
+    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
+}

package/src/plugins/js/index.d.ts

@@ -1,4 +1,5 @@
-import { CreateDependencies, CreateNodes } from '../../project-graph/plugins';
+import { CreateDependencies, CreateNodes, CreateNodesV2 } from '../../project-graph/plugins';
 export declare const name = "nx/js/dependencies-and-lockfile";
+export declare const createNodesV2: CreateNodesV2;
 export declare const createNodes: CreateNodes;
 export declare const createDependencies: CreateDependencies;

package/src/plugins/js/index.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDependencies = exports.createNodes = exports.name = void 0;
+exports.createDependencies = exports.createNodes = exports.createNodesV2 = exports.name = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const perf_hooks_1 = require("perf_hooks");
 const cache_directory_1 = require("../../utils/cache-directory");
 const globs_1 = require("../../utils/globs");
+const plugins_1 = require("../../project-graph/plugins");
 const lock_file_1 = require("./lock-file/lock-file");
 const build_dependencies_1 = require("./project-graph/build-dependencies/build-dependencies");
 const config_1 = require("./utils/config");
@@ -16,6 +17,12 @@ const versions_1 = require("../../utils/versions");
 const child_process_1 = require("child_process");
 exports.name = 'nx/js/dependencies-and-lockfile';
 let parsedLockFile = {};
+exports.createNodesV2 = [
+    (0, globs_1.combineGlobPatterns)(lock_file_1.LOCKFILES),
+    (files, _, context) => {
+        return (0, plugins_1.createNodesFromFiles)(exports.createNodes[1], files, _, context);
+    },
+];
 exports.createNodes = [
     // Look for all lockfiles
     (0, globs_1.combineGlobPatterns)(lock_file_1.LOCKFILES),

package/src/project-graph/plugins/loaded-nx-plugin.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoadedNxPlugin = void 0;
 const error_types_1 = require("../error-types");
-const utils_1 = require("./utils");
 const enabled_1 = require("./isolation/enabled");
 const client_1 = require("../../daemon/client/client");
 class LoadedNxPlugin {
@@ -14,10 +13,7 @@ class LoadedNxPlugin {
             this.exclude = pluginDefinition.exclude;
         }
         if (plugin.createNodes && !plugin.createNodesV2) {
-            this.createNodes = [
-                plugin.createNodes[0],
-                (configFiles, context) => (0, utils_1.createNodesFromFiles)(plugin.createNodes[1], configFiles, this.options, context).then((results) => results.map((r) => [this.name, r[0], r[1]])),
-            ];
+            throw new Error(`Plugin ${plugin.name} only provides \`createNodes\` which was removed in Nx 21, it should provide a \`createNodesV2\` implementation.`);
         }
         if (plugin.createNodesV2) {
             this.createNodes = [

package/src/tasks-runner/batch/run-batch.js

@@ -32,7 +32,7 @@ async function runTasks(executorName, projectGraph, batchTaskGraph, fullTaskGrap
         input[task.id] = (0, params_1.combineOptionsForExecutor)(task.overrides, task.target.configuration, targetConfiguration, batchExecutor.schema, null, process.cwd());
     }
     try {
-        const results = await batchExecutor.batchImplementationFactory()(batchTaskGraph, input, tasks[0].overrides, context);
+        const results = await batchExecutor.batchImplementationFactory()(batchTaskGraph, input, tasks[tasks.length - 1].overrides, context);
         if (typeof results !== 'object') {
             throw new Error(`"${executorName} returned invalid results: ${results}`);
         }

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

@@ -1,6 +1,5 @@
 import { DefaultTasksRunnerOptions, RemoteCache } from './default-tasks-runner';
 import { Task } from '../config/task-graph';
-import { NxJsonConfiguration } from '../config/nx-json';
 export type CachedResult = {
     terminalOutput: string;
     outputsPath: string;
@@ -11,7 +10,7 @@ export type TaskWithCachedResult = {
     task: Task;
     cachedResult: CachedResult;
 };
-export declare function dbCacheEnabled(nxJson?: NxJsonConfiguration): boolean;
+export declare function dbCacheEnabled(): boolean;
 export declare function getCache(options: DefaultTasksRunnerOptions): DbCache | Cache;
 export declare class DbCache {
     private readonly options;

package/src/tasks-runner/cache.js

@@ -24,23 +24,7 @@ const is_ci_1 = require("../utils/is-ci");
 const output_1 = require("../utils/output");
 const logger_1 = require("../utils/logger");
 // This function is called once during tasks runner initialization. It checks if the db cache is enabled and logs a warning if it is not.
-function dbCacheEnabled(nxJson = (0, nx_json_1.readNxJson)()) {
-    // If the user has explicitly disabled the db cache, we can warn...
-    if (nxJson.useLegacyCache ||
-        process.env.NX_DISABLE_DB === 'true' ||
-        process.env.NX_DB_CACHE === 'false') {
-        let readMoreLink = 'https://nx.dev/deprecated/legacy-cache';
-        if (nxJson.tasksRunnerOptions?.default?.runner &&
-            !['nx-cloud', 'nx/tasks-runners/default', '@nrwl/nx-cloud'].includes(nxJson.tasksRunnerOptions.default.runner)) {
-            readMoreLink += '#tasksrunneroptions';
-        }
-        else if (process.env.NX_REJECT_UNKNOWN_LOCAL_CACHE === '0' ||
-            process.env.NX_REJECT_UNKNOWN_LOCAL_CACHE === 'false') {
-            readMoreLink += '#nxrejectunknownlocalcache';
-        }
-        logger_1.logger.warn(`Nx is configured to use the legacy cache. This cache will be removed in Nx 21. Read more at ${readMoreLink}.`);
-        return false;
-    }
+function dbCacheEnabled() {
     // ...but if on wasm and the the db cache isnt supported we shouldn't warn
     if (native_1.IS_WASM) {
         return false;
@@ -59,7 +43,7 @@ function dbCacheEnabled(nxJson = (0, nx_json_1.readNxJson)()) {
 // Do not change the order of these arguments as this function is used by nx cloud
 function getCache(options) {
     const nxJson = (0, nx_json_1.readNxJson)();
-    return dbCacheEnabled(nxJson)
+    return dbCacheEnabled()
         ? new DbCache({
             // Remove this in Nx 21
             nxCloudRemoteCache: (0, nx_cloud_utils_1.isNxCloudUsed)(nxJson) ? options.remoteCache : null,

package/src/tasks-runner/life-cycles/tui-summary-life-cycle.js

@@ -20,10 +20,10 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, args, overrides,
     let totalSuccessfulTasks = 0;
     let totalFailedTasks = 0;
     let totalCompletedTasks = 0;
-    let totalStoppedTasks = 0;
     let timeTakenText;
     const failedTasks = new Set();
     const inProgressTasks = new Set();
+    const stoppedTasks = new Set();
     const tasksToTerminalOutputs = {};
     const taskIdsInOrderOfCompletion = [];
     lifeCycle.startTasks = (tasks) => {
@@ -37,7 +37,8 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, args, overrides,
     };
     lifeCycle.setTaskStatus = (taskId, taskStatus) => {
         if (taskStatus === 9 /* NativeTaskStatus.Stopped */) {
-            totalStoppedTasks++;
+            stoppedTasks.add(taskId);
+            inProgressTasks.delete(taskId);
         }
     };
     lifeCycle.endTasks = (taskResults) => {
@@ -83,7 +84,7 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, args, overrides,
     };
     const printRunOneSummary = () => {
         let lines = [];
-        const failure = totalSuccessfulTasks + totalStoppedTasks !== totalTasks;
+        const failure = totalSuccessfulTasks + stoppedTasks.size !== totalTasks;
         // Prints task outputs in the order they were completed
         // above the summary, since run-one should print all task results.
         for (const taskId of taskIdsInOrderOfCompletion) {
@@ -107,7 +108,7 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, args, overrides,
             }
             lines = [output_1.output.colors.green(lines.join(node_os_1.EOL))];
         }
-        else if (totalCompletedTasks + totalStoppedTasks === totalTasks) {
+        else if (totalCompletedTasks + stoppedTasks.size === totalTasks) {
             let text = `Ran target ${output_1.output.bold(targets[0])} for project ${output_1.output.bold(initiatingProject)}`;
             if (tasks.length > 1) {
                 text += ` and ${output_1.output.bold(tasks.length - 1)} task(s) they depend on`;
@@ -129,7 +130,7 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, args, overrides,
                     `${LEFT_PAD}${output_1.output.colors.red(figures.cross)}${SPACER}${totalFailedTasks}${`/${totalCompletedTasks}`} failed`,
                     `${LEFT_PAD}${output_1.output.dim(figures.tick)}${SPACER}${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`,
                     ...viewLogs,
-                ]),
+                ].join(node_os_1.EOL)),
             ];
         }
         else {
@@ -145,7 +146,7 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, args, overrides,
     const printRunManySummary = () => {
         console.log('');
         const lines = [];
-        const failure = totalSuccessfulTasks + totalStoppedTasks !== totalTasks;
+        const failure = totalSuccessfulTasks + stoppedTasks.size !== totalTasks;
         for (const taskId of taskIdsInOrderOfCompletion) {
             const { terminalOutput, taskStatus } = tasksToTerminalOutputs[taskId];
             if (taskStatus === 'failure') {
@@ -157,7 +158,7 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, args, overrides,
             }
         }
         lines.push(...output_1.output.getVerticalSeparatorLines(failure ? 'red' : 'green'));
-        if (totalSuccessfulTasks + totalStoppedTasks === totalTasks) {
+        if (totalSuccessfulTasks + stoppedTasks.size === totalTasks) {
             const successSummaryRows = [];
             const text = `Successfully ran ${(0, formatting_utils_1.formatTargetsAndProjects)(projectNames, targets, tasks)}`;
             const taskOverridesRows = [];

package/src/tasks-runner/pseudo-terminal.d.ts

@@ -8,6 +8,7 @@ export declare class PseudoTerminal {
     private pseudoIPCPath;
     private pseudoIPC;
     private initialized;
+    private childProcesses;
     static isSupported(): boolean;
     constructor(rustPseudoTerminal: RustPseudoTerminal);
     init(): Promise<void>;

package/src/tasks-runner/pseudo-terminal.js

@@ -38,6 +38,7 @@ class PseudoTerminal {
         this.pseudoIPCPath = (0, socket_utils_1.getForkedProcessOsSocketPath)(process.pid.toString() + '-' + id++);
         this.pseudoIPC = new pseudo_ipc_1.PseudoIPCServer(this.pseudoIPCPath);
         this.initialized = false;
+        this.childProcesses = new Set();
     }
     async init() {
         if (this.initialized) {
@@ -47,18 +48,27 @@ class PseudoTerminal {
         this.initialized = true;
     }
     shutdown() {
+        for (const cp of this.childProcesses) {
+            try {
+                cp.kill();
+            }
+            catch { }
+        }
         if (this.initialized) {
             this.pseudoIPC.close();
         }
     }
     runCommand(command, { cwd, execArgv, jsEnv, quiet, tty, } = {}) {
-        return new PseudoTtyProcess(this.rustPseudoTerminal, this.rustPseudoTerminal.runCommand(command, cwd, jsEnv, execArgv, quiet, tty));
+        const cp = new PseudoTtyProcess(this.rustPseudoTerminal, this.rustPseudoTerminal.runCommand(command, cwd, jsEnv, execArgv, quiet, tty));
+        this.childProcesses.add(cp);
+        return cp;
     }
     async fork(id, script, { cwd, execArgv, jsEnv, quiet, }) {
         if (!this.initialized) {
             throw new Error('Call init() before forking processes');
         }
         const cp = new PseudoTtyProcessWithSend(this.rustPseudoTerminal, this.rustPseudoTerminal.fork(id, script, this.pseudoIPCPath, cwd, jsEnv, execArgv, quiet), id, this.pseudoIPC);
+        this.childProcesses.add(cp);
         await this.pseudoIPC.waitForChildReady(id);
         return cp;
     }

package/src/tasks-runner/run-command.js

@@ -17,7 +17,6 @@ const create_task_hasher_1 = require("../hasher/create-task-hasher");
 const hash_task_1 = require("../hasher/hash-task");
 const tasks_execution_hooks_1 = require("../project-graph/plugins/tasks-execution-hooks");
 const project_graph_1 = require("../project-graph/project-graph");
-const fileutils_1 = require("../utils/fileutils");
 const handle_errors_1 = require("../utils/handle-errors");
 const is_ci_1 = require("../utils/is-ci");
 const nx_cloud_utils_1 = require("../utils/nx-cloud-utils");
@@ -241,6 +240,7 @@ async function getTerminalOutputLifeCycle(initiatingProject, initiatingTasks, pr
 }
 function createTaskGraphAndRunValidations(projectGraph, extraTargetDependencies, projectNames, nxArgs, overrides, extraOptions) {
     const taskGraph = (0, create_task_graph_1.createTaskGraph)(projectGraph, extraTargetDependencies, projectNames, nxArgs.targets, nxArgs.configuration, overrides, extraOptions.excludeTaskDependencies);
+    (0, task_graph_utils_1.assertTaskGraphDoesNotContainInvalidTargets)(taskGraph);
     const cycle = (0, task_graph_utils_1.findCycle)(taskGraph);
     if (cycle) {
         if (process.env.NX_IGNORE_CYCLES === 'true' || nxArgs.nxIgnoreCycles) {
@@ -712,14 +712,6 @@ function getRunner(nxArgs, nxJson) {
     }
     const modulePath = getTasksRunnerPath(runner, nxJson);
     try {
-        if (isCustomRunnerPath(modulePath)) {
-            output_1.output.warn({
-                title: `Custom task runners will be replaced by a new API starting with Nx 21.`,
-                bodyLines: [
-                    `For more information, see https://nx.dev/deprecated/custom-tasks-runner`,
-                ],
-            });
-        }
         const tasksRunner = loadTasksRunner(modulePath);
         return {
             tasksRunner,
@@ -732,18 +724,12 @@ function getRunner(nxArgs, nxJson) {
 }
 const defaultTasksRunnerPath = require.resolve('./default-tasks-runner');
 function getTasksRunnerPath(runner, nxJson) {
-    let modulePath = nxJson.tasksRunnerOptions?.[runner]?.runner;
-    if (modulePath) {
-        if ((0, fileutils_1.isRelativePath)(modulePath)) {
-            return (0, node_path_1.join)(workspace_root_1.workspaceRoot, modulePath);
-        }
-        return modulePath;
-    }
     const isCloudRunner = 
     // No tasksRunnerOptions for given --runner
     nxJson.nxCloudAccessToken ||
         // No runner prop in tasks runner options, check if access token is set.
         nxJson.tasksRunnerOptions?.[runner]?.options?.accessToken ||
+        ['nx-cloud', '@nrwl/nx-cloud'].includes(nxJson.tasksRunnerOptions?.[runner]?.runner) ||
         // Cloud access token specified in env var.
         process.env.NX_CLOUD_ACCESS_TOKEN ||
         // Nx Cloud ID specified in nxJson
@@ -792,11 +778,3 @@ function getRunnerOptions(runner, nxJson, nxArgs, isCloudDefault) {
     }
     return result;
 }
-function isCustomRunnerPath(modulePath) {
-    return ![
-        'nx-cloud',
-        '@nrwl/nx-cloud',
-        'nx/tasks-runners/default',
-        defaultTasksRunnerPath,
-    ].includes(modulePath);
-}

package/src/tasks-runner/task-graph-utils.d.ts

@@ -6,6 +6,7 @@ import { TaskGraph } from '../config/task-graph';
  */
 export declare function findCycle(graph: {
     dependencies: Record<string, string[]>;
+    continuousDependencies?: Record<string, string[]>;
 }): string[] | null;
 /**
  * This function finds all cycles in the graph.
@@ -13,9 +14,11 @@ export declare function findCycle(graph: {
  */
 export declare function findCycles(graph: {
     dependencies: Record<string, string[]>;
+    continuousDependencies?: Record<string, string[]>;
 }): Set<string> | null;
 export declare function makeAcyclic(graph: {
     roots: string[];
     dependencies: Record<string, string[]>;
 }): void;
 export declare function validateNoAtomizedTasks(taskGraph: TaskGraph, projectGraph: ProjectGraph): void;
+export declare function assertTaskGraphDoesNotContainInvalidTargets(taskGraph: TaskGraph): void;

package/src/tasks-runner/task-graph-utils.js

@@ -4,12 +4,16 @@ exports.findCycle = findCycle;
 exports.findCycles = findCycles;
 exports.makeAcyclic = makeAcyclic;
 exports.validateNoAtomizedTasks = validateNoAtomizedTasks;
+exports.assertTaskGraphDoesNotContainInvalidTargets = assertTaskGraphDoesNotContainInvalidTargets;
 const output_1 = require("../utils/output");
 function _findCycle(graph, id, visited, path) {
     if (visited[id])
         return null;
     visited[id] = true;
-    for (const d of graph.dependencies[id]) {
+    for (const d of [
+        ...graph.dependencies[id],
+        ...(graph.continuousDependencies?.[id] ?? []),
+    ]) {
         if (path.includes(d))
             return [...path, d];
         const cycle = _findCycle(graph, d, visited, [...path, d]);
@@ -57,9 +61,11 @@ function _makeAcyclic(graph, id, visited, path) {
         return;
     visited[id] = true;
     const deps = graph.dependencies[id];
-    for (const d of [...deps]) {
+    const continuousDeps = graph.continuousDependencies?.[id] ?? [];
+    for (const d of [...deps, ...continuousDeps]) {
         if (path.includes(d)) {
             deps.splice(deps.indexOf(d), 1);
+            continuousDeps.splice(continuousDeps.indexOf(d), 1);
         }
         else {
             _makeAcyclic(graph, d, visited, [...path, d]);
@@ -109,3 +115,26 @@ function validateNoAtomizedTasks(taskGraph, projectGraph) {
     }
     process.exit(1);
 }
+function assertTaskGraphDoesNotContainInvalidTargets(taskGraph) {
+    const invalidTasks = [];
+    for (const task of Object.values(taskGraph.tasks)) {
+        if (task.parallelism === false &&
+            taskGraph.continuousDependencies[task.id].length > 0) {
+            invalidTasks.push(task);
+        }
+    }
+    if (invalidTasks.length > 0) {
+        throw new NonParallelTaskDependsOnContinuousTasksError(invalidTasks, taskGraph);
+    }
+}
+class NonParallelTaskDependsOnContinuousTasksError extends Error {
+    constructor(invalidTasks, taskGraph) {
+        let message = 'The following tasks do not support parallelism but depend on continuous tasks:';
+        for (const task of invalidTasks) {
+            message += `\n - ${task.id} -> ${taskGraph.continuousDependencies[task.id].join(', ')}`;
+        }
+        super(message);
+        this.invalidTasks = invalidTasks;
+        this.name = 'NonParallelTaskDependsOnContinuousTasksError';
+    }
+}

package/src/tasks-runner/task-orchestrator.js

@@ -173,7 +173,7 @@ class TaskOrchestrator {
         // No output files to restore
         !!outputs.length &&
             // Remote caches are restored to output dirs when applied and using db cache
-            (!cachedResult.remote || !(0, cache_1.dbCacheEnabled)(this.nxJson)) &&
+            (!cachedResult.remote || !(0, cache_1.dbCacheEnabled)()) &&
             // Output files have not been touched since last run
             (await this.shouldCopyOutputsFromCache(outputs, task.hash));
         if (shouldCopyOutputsFromCache) {
@@ -194,6 +194,7 @@ class TaskOrchestrator {
     // endregion Applying Cache
     // region Batch
     async applyFromCacheOrRunBatch(doNotSkipCache, batch, groupId) {
+        const applyFromCacheOrRunBatchStart = perf_hooks_1.performance.mark('TaskOrchestrator-apply-from-cache-or-run-batch:start');
         const taskEntries = Object.entries(batch.taskGraph.tasks);
         const tasks = taskEntries.map(([, task]) => task);
         // Wait for batch to be processed
@@ -219,8 +220,12 @@ class TaskOrchestrator {
                 taskGraph: (0, utils_1.removeTasksFromTaskGraph)(batch.taskGraph, tasksCompleted.map(([taskId]) => taskId)),
             }, groupId);
         }
+        // Batch is done, mark it as completed
+        const applyFromCacheOrRunBatchEnd = perf_hooks_1.performance.mark('TaskOrchestrator-apply-from-cache-or-run-batch:end');
+        perf_hooks_1.performance.measure('TaskOrchestrator-apply-from-cache-or-run-batch', applyFromCacheOrRunBatchStart.name, applyFromCacheOrRunBatchEnd.name);
     }
     async runBatch(batch, env) {
+        const runBatchStart = perf_hooks_1.performance.mark('TaskOrchestrator-run-batch:start');
         try {
             const batchProcess = await this.forkedProcessTaskRunner.forkProcessForBatch(batch, this.projectGraph, this.taskGraph, env);
             const results = await batchProcess.getResults();
@@ -242,6 +247,10 @@ class TaskOrchestrator {
                 status: 'failure',
             }));
         }
+        finally {
+            const runBatchEnd = perf_hooks_1.performance.mark('TaskOrchestrator-run-batch:end');
+            perf_hooks_1.performance.measure('TaskOrchestrator-run-batch', runBatchStart.name, runBatchEnd.name);
+        }
     }
     // endregion Batch
     // region Single Task