nx 19.8.0-canary.20240911-2a3307c → 19.8.0-canary.20240913-5bbaffb

package/src/daemon/message-types/task-history.d.ts

@@ -1,13 +1,19 @@
-import type { TaskRun } from '../../native';
+import type { TaskRun, TaskTarget } from '../../native';
 export declare const GET_FLAKY_TASKS: "GET_FLAKY_TASKS";
+export declare const GET_ESTIMATED_TASK_TIMINGS: "GET_ESTIMATED_TASK_TIMINGS";
+export declare const RECORD_TASK_RUNS: "RECORD_TASK_RUNS";
 export type HandleGetFlakyTasks = {
     type: typeof GET_FLAKY_TASKS;
     hashes: string[];
 };
-export declare function isHandleGetFlakyTasksMessage(message: unknown): message is HandleGetFlakyTasks;
-export declare const RECORD_TASK_RUNS: "RECORD_TASK_RUNS";
+export type HandleGetEstimatedTaskTimings = {
+    type: typeof GET_ESTIMATED_TASK_TIMINGS;
+    targets: TaskTarget[];
+};
 export type HandleRecordTaskRunsMessage = {
     type: typeof RECORD_TASK_RUNS;
     taskRuns: TaskRun[];
 };
+export declare function isHandleGetFlakyTasksMessage(message: unknown): message is HandleGetFlakyTasks;
+export declare function isHandleGetEstimatedTaskTimings(message: unknown): message is HandleGetEstimatedTaskTimings;
 export declare function isHandleWriteTaskRunsToHistoryMessage(message: unknown): message is HandleRecordTaskRunsMessage;

package/src/daemon/message-types/task-history.js

@@ -1,16 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RECORD_TASK_RUNS = exports.GET_FLAKY_TASKS = void 0;
+exports.RECORD_TASK_RUNS = exports.GET_ESTIMATED_TASK_TIMINGS = exports.GET_FLAKY_TASKS = void 0;
 exports.isHandleGetFlakyTasksMessage = isHandleGetFlakyTasksMessage;
+exports.isHandleGetEstimatedTaskTimings = isHandleGetEstimatedTaskTimings;
 exports.isHandleWriteTaskRunsToHistoryMessage = isHandleWriteTaskRunsToHistoryMessage;
 exports.GET_FLAKY_TASKS = 'GET_FLAKY_TASKS';
+exports.GET_ESTIMATED_TASK_TIMINGS = 'GET_ESTIMATED_TASK_TIMINGS';
+exports.RECORD_TASK_RUNS = 'RECORD_TASK_RUNS';
 function isHandleGetFlakyTasksMessage(message) {
     return (typeof message === 'object' &&
         message !== null &&
         'type' in message &&
         message['type'] === exports.GET_FLAKY_TASKS);
 }
-exports.RECORD_TASK_RUNS = 'RECORD_TASK_RUNS';
+function isHandleGetEstimatedTaskTimings(message) {
+    return (typeof message === 'object' &&
+        message !== null &&
+        'type' in message &&
+        message['type'] === exports.GET_ESTIMATED_TASK_TIMINGS);
+}
 function isHandleWriteTaskRunsToHistoryMessage(message) {
     return (typeof message === 'object' &&
         message !== null &&

package/src/daemon/server/handle-task-history.d.ts

@@ -1,4 +1,4 @@
-import { TaskRun } from '../../native';
+import type { TaskRun, TaskTarget } from '../../native';
 export declare function handleRecordTaskRuns(taskRuns: TaskRun[]): Promise<{
     response: string;
     description: string;
@@ -7,3 +7,7 @@ export declare function handleGetFlakyTasks(hashes: string[]): Promise<{
     response: string;
     description: string;
 }>;
+export declare function handleGetEstimatedTaskTimings(targets: TaskTarget[]): Promise<{
+    response: string;
+    description: string;
+}>;

package/src/daemon/server/handle-task-history.js

@@ -2,16 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleRecordTaskRuns = handleRecordTaskRuns;
 exports.handleGetFlakyTasks = handleGetFlakyTasks;
+exports.handleGetEstimatedTaskTimings = handleGetEstimatedTaskTimings;
 const task_history_1 = require("../../utils/task-history");
-let taskHistory;
-function getTaskHistory() {
-    if (!taskHistory) {
-        taskHistory = new task_history_1.TaskHistory();
-    }
-    return taskHistory;
-}
 async function handleRecordTaskRuns(taskRuns) {
-    const taskHistory = getTaskHistory();
+    const taskHistory = (0, task_history_1.getTaskHistory)();
     await taskHistory.recordTaskRuns(taskRuns);
     return {
         response: 'true',
@@ -19,10 +13,18 @@ async function handleRecordTaskRuns(taskRuns) {
     };
 }
 async function handleGetFlakyTasks(hashes) {
-    const taskHistory = getTaskHistory();
+    const taskHistory = (0, task_history_1.getTaskHistory)();
     const history = await taskHistory.getFlakyTasks(hashes);
     return {
         response: JSON.stringify(history),
         description: 'handleGetFlakyTasks',
     };
 }
+async function handleGetEstimatedTaskTimings(targets) {
+    const taskHistory = (0, task_history_1.getTaskHistory)();
+    const history = await taskHistory.getEstimatedTaskTimings(targets);
+    return {
+        response: JSON.stringify(history),
+        description: 'handleGetEstimatedTaskTimings',
+    };
+}

package/src/daemon/server/server.js

@@ -140,10 +140,13 @@ async function handleMessage(socket, data) {
         await handleResult(socket, hash_glob_1.HASH_GLOB, () => (0, handle_hash_glob_1.handleHashGlob)(payload.globs, payload.exclude));
     }
     else if ((0, task_history_1.isHandleGetFlakyTasksMessage)(payload)) {
-        await handleResult(socket, 'GET_TASK_HISTORY_FOR_HASHES', () => (0, handle_task_history_1.handleGetFlakyTasks)(payload.hashes));
+        await handleResult(socket, task_history_1.GET_FLAKY_TASKS, () => (0, handle_task_history_1.handleGetFlakyTasks)(payload.hashes));
+    }
+    else if ((0, task_history_1.isHandleGetEstimatedTaskTimings)(payload)) {
+        await handleResult(socket, task_history_1.GET_ESTIMATED_TASK_TIMINGS, () => (0, handle_task_history_1.handleGetEstimatedTaskTimings)(payload.targets));
     }
     else if ((0, task_history_1.isHandleWriteTaskRunsToHistoryMessage)(payload)) {
-        await handleResult(socket, 'WRITE_TASK_RUNS_TO_HISTORY', () => (0, handle_task_history_1.handleRecordTaskRuns)(payload.taskRuns));
+        await handleResult(socket, task_history_1.RECORD_TASK_RUNS, () => (0, handle_task_history_1.handleRecordTaskRuns)(payload.taskRuns));
     }
     else if ((0, force_shutdown_1.isHandleForceShutdownMessage)(payload)) {
         await handleResult(socket, 'FORCE_SHUTDOWN', () => (0, handle_force_shutdown_1.handleForceShutdown)(server));

package/src/native/index.d.ts

@@ -41,6 +41,7 @@ export declare class NxTaskHistory {
   constructor(db: ExternalObject<Connection>)
   recordTaskRuns(taskRuns: Array<TaskRun>): void
   getFlakyTasks(hashes: Array<string>): Array<string>
+  getEstimatedTaskTimings(targets: Array<TaskTarget>): Record<string, number>
 }
 
 export declare class RustPseudoTerminal {

package/src/native/nx.wasi.cjs

@@ -113,26 +113,26 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__TaskHasher_impl_42']?.()
   __napiInstance.exports['__napi_register__TaskRun_struct_43']?.()
   __napiInstance.exports['__napi_register__NxTaskHistory_struct_44']?.()
-  __napiInstance.exports['__napi_register__NxTaskHistory_impl_48']?.()
-  __napiInstance.exports['__napi_register__Task_struct_49']?.()
-  __napiInstance.exports['__napi_register__TaskTarget_struct_50']?.()
-  __napiInstance.exports['__napi_register__TaskGraph_struct_51']?.()
-  __napiInstance.exports['__napi_register__FileData_struct_52']?.()
-  __napiInstance.exports['__napi_register__InputsInput_struct_53']?.()
-  __napiInstance.exports['__napi_register__FileSetInput_struct_54']?.()
-  __napiInstance.exports['__napi_register__RuntimeInput_struct_55']?.()
-  __napiInstance.exports['__napi_register__EnvironmentInput_struct_56']?.()
-  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_57']?.()
-  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_58']?.()
-  __napiInstance.exports['__napi_register__NxJson_struct_59']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_60']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_69']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_70']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_71']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_72']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_73']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_74']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_75']?.()
+  __napiInstance.exports['__napi_register__NxTaskHistory_impl_49']?.()
+  __napiInstance.exports['__napi_register__Task_struct_50']?.()
+  __napiInstance.exports['__napi_register__TaskTarget_struct_51']?.()
+  __napiInstance.exports['__napi_register__TaskGraph_struct_52']?.()
+  __napiInstance.exports['__napi_register__FileData_struct_53']?.()
+  __napiInstance.exports['__napi_register__InputsInput_struct_54']?.()
+  __napiInstance.exports['__napi_register__FileSetInput_struct_55']?.()
+  __napiInstance.exports['__napi_register__RuntimeInput_struct_56']?.()
+  __napiInstance.exports['__napi_register__EnvironmentInput_struct_57']?.()
+  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_58']?.()
+  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_59']?.()
+  __napiInstance.exports['__napi_register__NxJson_struct_60']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_struct_61']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_impl_70']?.()
+  __napiInstance.exports['__napi_register__WorkspaceErrors_71']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_72']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_73']?.()
+  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_74']?.()
+  __napiInstance.exports['__napi_register__FileMap_struct_75']?.()
+  __napiInstance.exports['__napi_register____test_only_transfer_file_map_76']?.()
 }
 module.exports.HashPlanner = __napiModule.exports.HashPlanner
 module.exports.ImportResult = __napiModule.exports.ImportResult

package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.js

@@ -89,7 +89,6 @@ async function connectToNxCloud(tree, schema, nxJson = (0, nx_json_1.readNxJson)
         return null;
     }
     const isGitHubDetected = schema.github ?? (await (0, url_shorten_1.repoUsesGithub)(schema.github));
-    let responseFromCreateNxCloudWorkspaceV1;
     let responseFromCreateNxCloudWorkspaceV2;
     /**
      * Do not create an Nx Cloud token if the user is using GitHub and

package/src/nx-cloud/utilities/get-cloud-options.d.ts

@@ -2,3 +2,4 @@ import { CloudTaskRunnerOptions } from '../nx-cloud-tasks-runner-shell';
 export declare function getCloudOptions(directory?: string): CloudTaskRunnerOptions;
 export declare function getCloudUrl(): string;
 export declare function removeTrailingSlash(apiUrl: string): string;
+export declare function isNxCloudId(token: string): boolean;

package/src/nx-cloud/utilities/get-cloud-options.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCloudOptions = getCloudOptions;
 exports.getCloudUrl = getCloudUrl;
 exports.removeTrailingSlash = removeTrailingSlash;
+exports.isNxCloudId = isNxCloudId;
 const nx_json_1 = require("../../config/nx-json");
 const run_command_1 = require("../../tasks-runner/run-command");
 const workspace_root_1 = require("../../utils/workspace-root");
@@ -17,3 +18,6 @@ function getCloudUrl() {
 function removeTrailingSlash(apiUrl) {
     return apiUrl[apiUrl.length - 1] === '/' ? apiUrl.slice(0, -1) : apiUrl;
 }
+function isNxCloudId(token) {
+    return token.length === 24;
+}

package/src/nx-cloud/utilities/is-workspace-claimed.d.ts

@@ -1 +1 @@
-export declare function isWorkspaceClaimed(nxCloudAccessToken: any): Promise<any>;
+export declare function isWorkspaceClaimed(accessToken: string): Promise<any>;

package/src/nx-cloud/utilities/is-workspace-claimed.js

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isWorkspaceClaimed = isWorkspaceClaimed;
 const get_cloud_options_1 = require("./get-cloud-options");
-async function isWorkspaceClaimed(nxCloudAccessToken) {
-    if (!nxCloudAccessToken)
+async function isWorkspaceClaimed(accessToken) {
+    if (!accessToken)
         return false;
     const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
     try {
-        const response = await require('axios').post(`${apiUrl}/nx-cloud/is-workspace-claimed`, {
-            nxCloudAccessToken,
-        });
+        const requestData = (0, get_cloud_options_1.isNxCloudId)(accessToken)
+            ? { nxCloudId: accessToken }
+            : { nxCloudAccessToken: accessToken };
+        const response = await require('axios').post(`${apiUrl}/nx-cloud/is-workspace-claimed`, requestData);
         if (response.data.message) {
             return false;
         }

package/src/nx-cloud/utilities/onboarding.js

@@ -23,6 +23,6 @@ async function getNxCloudAppOnBoardingUrl(token) {
 }
 function readNxCloudToken(tree) {
     const nxJson = (0, devkit_exports_1.readNxJson)(tree);
-    const { accessToken } = (0, run_command_1.getRunnerOptions)('default', nxJson, {}, true);
-    return accessToken;
+    const { accessToken, nxCloudId } = (0, run_command_1.getRunnerOptions)('default', nxJson, {}, true);
+    return accessToken || nxCloudId;
 }

package/src/plugins/js/utils/register.js

@@ -63,6 +63,13 @@ function registerTsProject(path, configFilename) {
     //       Based on limited testing, it doesn't seem to matter if we register it multiple times, but just in
     //       case let's keep a flag to prevent it.
     if (!isTsEsmLoaderRegistered) {
+        // We need a way to ensure that `.ts` files are treated as ESM not CJS.
+        // Since there is no way to pass compilerOptions like we do with the programmatic API, we should default
+        // the environment variable that ts-node checks.
+        process.env.TS_NODE_COMPILER_OPTIONS ??= JSON.stringify({
+            moduleResolution: 'nodenext',
+            module: 'nodenext',
+        });
         const module = require('node:module');
         if (module.register && packageIsInstalled('ts-node/esm')) {
             const url = require('node:url');

package/src/project-graph/error-types.d.ts

@@ -18,7 +18,7 @@ export declare class ProjectGraphError extends Error {
      */
     getPartialProjectGraph(): ProjectGraph;
     getPartialSourcemaps(): ConfigurationSourceMaps;
-    getErrors(): (AggregateCreateNodesError | MergeNodesError | CreateMetadataError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError | ProcessDependenciesError | ProcessProjectGraphError | WorkspaceValidityError)[];
+    getErrors(): (AggregateCreateNodesError | MergeNodesError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError | CreateMetadataError | ProcessDependenciesError | ProcessProjectGraphError | WorkspaceValidityError)[];
 }
 export declare class MultipleProjectsWithSameNameError extends Error {
     conflicts: Map<string, string[]>;

package/src/project-graph/error-types.js

@@ -24,7 +24,7 @@ class ProjectGraphError extends Error {
         tslib_1.__classPrivateFieldSet(this, _ProjectGraphError_partialProjectGraph, partialProjectGraph, "f");
         tslib_1.__classPrivateFieldSet(this, _ProjectGraphError_partialSourceMaps, partialSourceMaps, "f");
         this.stack = `${this.message}\n  ${errors
-            .map((error) => error.stack.split('\n').join('\n  '))
+            .map((error) => indentString(formatErrorStackAndCause(error), 2))
             .join('\n')}`;
     }
     /**
@@ -186,13 +186,13 @@ class MergeNodesError extends Error {
         this.name = this.constructor.name;
         this.file = file;
         this.pluginName = pluginName;
-        this.stack = `${this.message}\n  ${error.stack.split('\n').join('\n  ')}`;
+        this.stack = `${this.message}\n${indentString(formatErrorStackAndCause(error), 2)}`;
     }
 }
 exports.MergeNodesError = MergeNodesError;
 class CreateMetadataError extends Error {
     constructor(error, plugin) {
-        super(`The "${plugin}" plugin threw an error while creating metadata:`, {
+        super(`The "${plugin}" plugin threw an error while creating metadata: ${error.message}`, {
             cause: error,
         });
         this.error = error;
@@ -203,7 +203,7 @@ class CreateMetadataError extends Error {
 exports.CreateMetadataError = CreateMetadataError;
 class ProcessDependenciesError extends Error {
     constructor(pluginName, { cause }) {
-        super(`The "${pluginName}" plugin threw an error while creating dependencies:`, {
+        super(`The "${pluginName}" plugin threw an error while creating dependencies: ${cause.message}`, {
             cause,
         });
         this.pluginName = pluginName;
@@ -234,7 +234,7 @@ class ProcessProjectGraphError extends Error {
         });
         this.pluginName = pluginName;
         this.name = this.constructor.name;
-        this.stack = `${this.message}\n  ${cause.stack.split('\n').join('\n  ')}`;
+        this.stack = `${this.message}\n${indentString(cause, 2)}`;
     }
 }
 exports.ProcessProjectGraphError = ProcessProjectGraphError;
@@ -289,3 +289,17 @@ class LoadPluginError extends Error {
     }
 }
 exports.LoadPluginError = LoadPluginError;
+function indentString(str, indent) {
+    return (' '.repeat(indent) +
+        str
+            .split('\n')
+            .map((line) => ' '.repeat(indent) + line)
+            .join('\n'));
+}
+function formatErrorStackAndCause(error) {
+    const cause = error.cause && error.cause instanceof Error ? error.cause : null;
+    return (error.stack +
+        (cause
+            ? `\nCaused by: \n${indentString(cause.stack ?? cause.message, 2)}`
+            : ''));
+}

package/src/tasks-runner/life-cycles/task-history-life-cycle.js

@@ -8,7 +8,7 @@ class TaskHistoryLifeCycle {
     constructor() {
         this.startTimings = {};
         this.taskRuns = new Map();
-        this.taskHistory = new task_history_1.TaskHistory();
+        this.taskHistory = (0, task_history_1.getTaskHistory)();
     }
     startTasks(tasks) {
         for (let task of tasks) {

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

@@ -17,7 +17,7 @@ const fileutils_1 = require("../utils/fileutils");
 const is_ci_1 = require("../utils/is-ci");
 const nx_cloud_utils_1 = require("../utils/nx-cloud-utils");
 const output_1 = require("../utils/output");
-const params_1 = require("../utils/params");
+const handle_errors_1 = require("../utils/handle-errors");
 const sync_generators_1 = require("../utils/sync-generators");
 const workspace_root_1 = require("../utils/workspace-root");
 const create_task_graph_1 = require("./create-task-graph");
@@ -98,7 +98,7 @@ function createTaskGraphAndRunValidations(projectGraph, extraTargetDependencies,
     return taskGraph;
 }
 async function runCommand(projectsToRun, currentProjectGraph, { nxJson }, nxArgs, overrides, initiatingProject, extraTargetDependencies, extraOptions) {
-    const status = await (0, params_1.handleErrors)(process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+    const status = await (0, handle_errors_1.handleErrors)(process.env.NX_VERBOSE_LOGGING === 'true', async () => {
         const projectNames = projectsToRun.map((t) => t.name);
         const { projectGraph, taskGraph } = await ensureWorkspaceIsInSyncAndGetGraphs(currentProjectGraph, nxJson, projectNames, nxArgs, overrides, extraTargetDependencies, extraOptions);
         const tasks = Object.values(taskGraph.tasks);

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

@@ -41,7 +41,10 @@ class TaskOrchestrator {
     }
     async run() {
         // Init the ForkedProcessTaskRunner
-        await this.forkedProcessTaskRunner.init();
+        await Promise.all([
+            this.forkedProcessTaskRunner.init(),
+            this.tasksSchedule.init(),
+        ]);
         // initial scheduling
         await this.scheduleNextTasks();
         perf_hooks_1.performance.mark('task-execution:start');

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

@@ -12,12 +12,15 @@ export declare class TasksSchedule {
     private notScheduledTaskGraph;
     private reverseTaskDeps;
     private reverseProjectGraph;
+    private taskHistory;
     private scheduledBatches;
     private scheduledTasks;
     private runningTasks;
     private completedTasks;
     private scheduleRequestsExecutionChain;
+    private estimatedTaskTimings;
     constructor(projectGraph: ProjectGraph, taskGraph: TaskGraph, options: DefaultTasksRunnerOptions);
+    init(): Promise<void>;
     scheduleNextTasks(): Promise<void>;
     hasTasks(): boolean;
     complete(taskIds: string[]): void;

package/src/tasks-runner/tasks-schedule.js

@@ -4,6 +4,7 @@ exports.TasksSchedule = void 0;
 const utils_1 = require("./utils");
 const project_graph_utils_1 = require("../utils/project-graph-utils");
 const operators_1 = require("../project-graph/operators");
+const task_history_1 = require("../utils/task-history");
 class TasksSchedule {
     constructor(projectGraph, taskGraph, options) {
         this.projectGraph = projectGraph;
@@ -12,12 +13,16 @@ class TasksSchedule {
         this.notScheduledTaskGraph = this.taskGraph;
         this.reverseTaskDeps = (0, utils_1.calculateReverseDeps)(this.taskGraph);
         this.reverseProjectGraph = (0, operators_1.reverse)(this.projectGraph);
+        this.taskHistory = (0, task_history_1.getTaskHistory)();
         this.scheduledBatches = [];
         this.scheduledTasks = [];
         this.runningTasks = new Set();
         this.completedTasks = new Set();
         this.scheduleRequestsExecutionChain = Promise.resolve();
     }
+    async init() {
+        this.estimatedTaskTimings = await this.taskHistory.getEstimatedTaskTimings(Object.values(this.taskGraph.tasks).map((t) => t.target));
+    }
     async scheduleNextTasks() {
         this.scheduleRequestsExecutionChain =
             this.scheduleRequestsExecutionChain.then(() => this.scheduleTasks());
@@ -81,10 +86,23 @@ class TasksSchedule {
             // Most likely tasks with no dependencies such as test
             const project1 = this.taskGraph.tasks[taskId1].target.project;
             const project2 = this.taskGraph.tasks[taskId2].target.project;
-            return ((0, project_graph_utils_1.findAllProjectNodeDependencies)(project2, this.reverseProjectGraph)
-                .length -
-                (0, project_graph_utils_1.findAllProjectNodeDependencies)(project1, this.reverseProjectGraph)
-                    .length);
+            const project1NodeDependencies = (0, project_graph_utils_1.findAllProjectNodeDependencies)(project1, this.reverseProjectGraph).length;
+            const project2NodeDependencies = (0, project_graph_utils_1.findAllProjectNodeDependencies)(project2, this.reverseProjectGraph).length;
+            const dependenciesDiff = project2NodeDependencies - project1NodeDependencies;
+            if (dependenciesDiff !== 0) {
+                return dependenciesDiff;
+            }
+            const task1Timing = this.estimatedTaskTimings[taskId1];
+            if (!task1Timing) {
+                // if no timing or 0, put task1 at beginning
+                return -1;
+            }
+            const task2Timing = this.estimatedTaskTimings[taskId2];
+            if (!task2Timing) {
+                // if no timing or 0, put task2 at beginning
+                return 1;
+            }
+            return task2Timing - task1Timing;
         });
         this.runningTasks.add(taskId);
     }

package/src/utils/handle-errors.d.ts

@@ -0,0 +1 @@
+export declare function handleErrors(isVerbose: boolean, fn: Function): Promise<number>;

package/src/utils/handle-errors.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleErrors = handleErrors;
+const client_1 = require("../daemon/client/client");
+const logger_1 = require("./logger");
+const output_1 = require("./output");
+async function handleErrors(isVerbose, fn) {
+    try {
+        const result = await fn();
+        if (typeof result === 'number') {
+            return result;
+        }
+        return 0;
+    }
+    catch (err) {
+        err ||= new Error('Unknown error caught');
+        if (err.constructor.name === 'UnsuccessfulWorkflowExecution') {
+            logger_1.logger.error('The generator workflow failed. See above.');
+        }
+        else if (err.name === 'ProjectGraphError') {
+            const projectGraphError = err;
+            let title = projectGraphError.message;
+            if (projectGraphError.cause &&
+                typeof projectGraphError.cause === 'object' &&
+                'message' in projectGraphError.cause) {
+                title += ' ' + projectGraphError.cause.message + '.';
+            }
+            if (isVerbose) {
+                title += ' See errors below.';
+            }
+            const bodyLines = isVerbose
+                ? formatErrorStackAndCause(projectGraphError)
+                : ['Pass --verbose to see the stacktraces.'];
+            output_1.output.error({
+                title,
+                bodyLines: bodyLines,
+            });
+        }
+        else {
+            const lines = (err.message ? err.message : err.toString()).split('\n');
+            const bodyLines = lines.slice(1);
+            if (isVerbose) {
+                bodyLines.push(...formatErrorStackAndCause(err));
+            }
+            else if (err.stack) {
+                bodyLines.push('Pass --verbose to see the stacktrace.');
+            }
+            output_1.output.error({
+                title: lines[0],
+                bodyLines,
+            });
+        }
+        if (client_1.daemonClient.enabled()) {
+            client_1.daemonClient.reset();
+        }
+        return 1;
+    }
+}
+function formatErrorStackAndCause(error) {
+    return [
+        error.stack || error.message,
+        ...(error.cause && typeof error.cause === 'object'
+            ? [
+                'Caused by:',
+                'stack' in error.cause
+                    ? error.cause.stack.toString()
+                    : error.cause.toString(),
+            ]
+            : []),
+    ];
+}

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

@@ -1,4 +1,3 @@
 import { NxJsonConfiguration } from '../config/nx-json';
 export declare function isNxCloudUsed(nxJson: NxJsonConfiguration): boolean;
 export declare function getNxCloudUrl(nxJson: NxJsonConfiguration): string;
-export declare function getNxCloudToken(nxJson: NxJsonConfiguration): string;

package/src/utils/nx-cloud-utils.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNxCloudUsed = isNxCloudUsed;
 exports.getNxCloudUrl = getNxCloudUrl;
-exports.getNxCloudToken = getNxCloudToken;
 function isNxCloudUsed(nxJson) {
     return (!!process.env.NX_CLOUD_ACCESS_TOKEN ||
         !!nxJson.nxCloudAccessToken ||
@@ -17,12 +16,3 @@ function getNxCloudUrl(nxJson) {
         throw new Error('nx-cloud runner not found in nx.json');
     return cloudRunner?.options?.url ?? nxJson.nxCloudUrl ?? 'https://nx.app';
 }
-function getNxCloudToken(nxJson) {
-    const cloudRunner = Object.values(nxJson.tasksRunnerOptions ?? {}).find((r) => r.runner == '@nrwl/nx-cloud' || r.runner == 'nx-cloud');
-    if (!cloudRunner &&
-        !(nxJson.nxCloudAccessToken || process.env.NX_CLOUD_ACCESS_TOKEN))
-        throw new Error('nx-cloud runner not found in nx.json');
-    return (process.env.NX_CLOUD_ACCESS_TOKEN ??
-        cloudRunner?.options.accessToken ??
-        nxJson.nxCloudAccessToken);
-}

package/src/utils/params.d.ts

@@ -79,7 +79,6 @@ export type Options = {
     '--'?: Unmatched[];
     [k: string]: string | number | boolean | string[] | Unmatched[] | undefined;
 };
-export declare function handleErrors(isVerbose: boolean, fn: Function): Promise<number>;
 export declare function convertToCamelCase(parsed: {
     [k: string]: any;
 }, schema: Schema): Options;

package/src/utils/params.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaError = void 0;
-exports.handleErrors = handleErrors;
 exports.convertToCamelCase = convertToCamelCase;
 exports.coerceTypesInOptions = coerceTypesInOptions;
 exports.convertAliases = convertAliases;
@@ -15,55 +14,6 @@ exports.warnDeprecations = warnDeprecations;
 exports.convertSmartDefaultsIntoNamedParams = convertSmartDefaultsIntoNamedParams;
 exports.getPromptsForSchema = getPromptsForSchema;
 const logger_1 = require("./logger");
-const output_1 = require("./output");
-const client_1 = require("../daemon/client/client");
-async function handleErrors(isVerbose, fn) {
-    try {
-        const result = await fn();
-        if (typeof result === 'number') {
-            return result;
-        }
-        return 0;
-    }
-    catch (err) {
-        err ||= new Error('Unknown error caught');
-        if (err.constructor.name === 'UnsuccessfulWorkflowExecution') {
-            logger_1.logger.error('The generator workflow failed. See above.');
-        }
-        else if (err.name === 'ProjectGraphError') {
-            const projectGraphError = err;
-            let title = projectGraphError.message;
-            if (isVerbose) {
-                title += ' See errors below.';
-            }
-            const bodyLines = isVerbose
-                ? [projectGraphError.stack]
-                : ['Pass --verbose to see the stacktraces.'];
-            output_1.output.error({
-                title,
-                bodyLines: bodyLines,
-            });
-        }
-        else {
-            const lines = (err.message ? err.message : err.toString()).split('\n');
-            const bodyLines = lines.slice(1);
-            if (err.stack && !isVerbose) {
-                bodyLines.push('Pass --verbose to see the stacktrace.');
-            }
-            output_1.output.error({
-                title: lines[0],
-                bodyLines,
-            });
-            if (err.stack && isVerbose) {
-                logger_1.logger.info(err.stack);
-            }
-        }
-        if (client_1.daemonClient.enabled()) {
-            client_1.daemonClient.reset();
-        }
-        return 1;
-    }
-}
 function camelCase(input) {
     if (input.indexOf('-') > 1) {
         return input

package/src/utils/plugins/plugin-capabilities.js

@@ -41,10 +41,13 @@ async function getPluginCapabilities(workspaceRoot, pluginName, projects, includ
             projectGraphExtension: pluginModule &&
                 ('processProjectGraph' in pluginModule ||
                     'createNodes' in pluginModule ||
+                    'createNodesV2' in pluginModule ||
+                    'createMetadata' in pluginModule ||
                     'createDependencies' in pluginModule),
             projectInference: pluginModule &&
                 ('projectFilePatterns' in pluginModule ||
-                    'createNodes' in pluginModule),
+                    'createNodes' in pluginModule ||
+                    'createNodesV2' in pluginModule),
         };
     }
     catch {