nx 0.0.0-pr-31974-83b6608 → 0.0.0-pr-31972-e7c1663

package/bin/nx.js

@@ -64,14 +64,14 @@ async function main() {
         if (!workspace) {
             handleNoWorkspace(GLOBAL_NX_VERSION);
         }
-        if (!localNx && !isNxCloudCommand(process.argv[2])) {
+        if (!localNx) {
             handleMissingLocalInstallation(workspace ? workspace.dir : null);
         }
         // this file is already in the local workspace
         if (isLocalInstall) {
             await (0, init_local_1.initLocal)(workspace);
         }
-        else if (localNx) {
+        else {
             // Nx is being run from globally installed CLI - hand off to the local
             warnIfUsingOutdatedGlobalInstall(GLOBAL_NX_VERSION, LOCAL_NX_VERSION);
             if (localNx.includes('.nx')) {
@@ -82,11 +82,6 @@ async function main() {
                 require(localNx);
             }
         }
-        else if (isNxCloudCommand(process.argv[2])) {
-            // nx-cloud commands can run without local Nx installation
-            process.env.NX_DAEMON = 'false';
-            require('nx/src/command-line/nx-commands').commandsObject.argv;
-        }
     }
 }
 function handleNoWorkspace(globalNxVersion) {
@@ -137,18 +132,6 @@ function resolveNx(workspace) {
         paths: [workspace ? workspace.dir : globalsRoot],
     });
 }
-function isNxCloudCommand(command) {
-    const nxCloudCommands = [
-        'start-ci-run',
-        'login',
-        'logout',
-        'connect',
-        'view-logs',
-        'fix-ci',
-        'record',
-    ];
-    return nxCloudCommands.includes(command);
-}
 function handleMissingLocalInstallation(detectedWorkspaceRoot) {
     output_1.output.error({
         title: detectedWorkspaceRoot

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "0.0.0-pr-31974-83b6608",
+  "version": "0.0.0-pr-31972-e7c1663",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -83,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "0.0.0-pr-31974-83b6608",
-    "@nx/nx-darwin-x64": "0.0.0-pr-31974-83b6608",
-    "@nx/nx-freebsd-x64": "0.0.0-pr-31974-83b6608",
-    "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-31974-83b6608",
-    "@nx/nx-linux-arm64-gnu": "0.0.0-pr-31974-83b6608",
-    "@nx/nx-linux-arm64-musl": "0.0.0-pr-31974-83b6608",
-    "@nx/nx-linux-x64-gnu": "0.0.0-pr-31974-83b6608",
-    "@nx/nx-linux-x64-musl": "0.0.0-pr-31974-83b6608",
-    "@nx/nx-win32-arm64-msvc": "0.0.0-pr-31974-83b6608",
-    "@nx/nx-win32-x64-msvc": "0.0.0-pr-31974-83b6608"
+    "@nx/nx-darwin-arm64": "0.0.0-pr-31972-e7c1663",
+    "@nx/nx-darwin-x64": "0.0.0-pr-31972-e7c1663",
+    "@nx/nx-freebsd-x64": "0.0.0-pr-31972-e7c1663",
+    "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-31972-e7c1663",
+    "@nx/nx-linux-arm64-gnu": "0.0.0-pr-31972-e7c1663",
+    "@nx/nx-linux-arm64-musl": "0.0.0-pr-31972-e7c1663",
+    "@nx/nx-linux-x64-gnu": "0.0.0-pr-31972-e7c1663",
+    "@nx/nx-linux-x64-musl": "0.0.0-pr-31972-e7c1663",
+    "@nx/nx-win32-arm64-msvc": "0.0.0-pr-31972-e7c1663",
+    "@nx/nx-win32-x64-msvc": "0.0.0-pr-31972-e7c1663"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/native/index.d.ts

@@ -22,6 +22,7 @@ export declare class AppLifeCycle {
   setTaskStatus(taskId: string, status: TaskStatus): void
   registerForcedShutdownCallback(forcedShutdownCallback: () => any): void
   __setCloudMessage(message: string): Promise<void>
+  setEstimatedTaskTimings(timings: Record<string, number>): void
 }
 
 export declare class ChildProcess {

package/src/tasks-runner/life-cycle.d.ts

@@ -41,6 +41,7 @@ export interface LifeCycle {
     appendTaskOutput?(taskId: string, output: string, isPtyTask: boolean): void;
     setTaskStatus?(taskId: string, status: NativeTaskStatus): void;
     registerForcedShutdownCallback?(callback: () => void): void;
+    setEstimatedTaskTimings?(timings: Record<string, number>): void;
 }
 export declare class CompositeLifeCycle implements LifeCycle {
     private readonly lifeCycles;
@@ -58,4 +59,5 @@ export declare class CompositeLifeCycle implements LifeCycle {
     appendTaskOutput(taskId: string, output: string, isPtyTask: boolean): void;
     setTaskStatus(taskId: string, status: NativeTaskStatus): void;
     registerForcedShutdownCallback(callback: () => void): void;
+    setEstimatedTaskTimings(timings: Record<string, number>): void;
 }

package/src/tasks-runner/life-cycle.js

@@ -102,5 +102,12 @@ class CompositeLifeCycle {
             }
         }
     }
+    setEstimatedTaskTimings(timings) {
+        for (let l of this.lifeCycles) {
+            if (l.setEstimatedTaskTimings) {
+                l.setEstimatedTaskTimings(timings);
+            }
+        }
+    }
 }
 exports.CompositeLifeCycle = CompositeLifeCycle;

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

@@ -66,6 +66,11 @@ class TaskOrchestrator {
             }),
             'init' in this.cache ? this.cache.init() : null,
         ]);
+        // Pass estimated timings to TUI after TasksSchedule is initialized
+        if (this.tuiEnabled) {
+            const estimatedTimings = this.tasksSchedule.getEstimatedTaskTimings();
+            this.options.lifeCycle.setEstimatedTaskTimings(estimatedTimings);
+        }
     }
     async run() {
         await this.init();

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

@@ -39,4 +39,5 @@ export declare class TasksSchedule {
     private processTaskForBatches;
     private canBatchTaskBeScheduled;
     private canBeScheduled;
+    getEstimatedTaskTimings(): Record<string, number>;
 }

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

@@ -201,5 +201,8 @@ class TasksSchedule {
             return this.taskGraph.tasks[taskId].parallelism === true;
         }
     }
+    getEstimatedTaskTimings() {
+        return this.estimatedTaskTimings;
+    }
 }
 exports.TasksSchedule = TasksSchedule;