nx 19.6.0-canary.20240723-c4f9d89 → 19.6.0-canary.20240724-684d2a9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.6.0-canary.20240723-c4f9d89",
+  "version": "19.6.0-canary.20240724-684d2a9",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -71,7 +71,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.6.0-canary.20240723-c4f9d89"
+    "@nrwl/tao": "19.6.0-canary.20240724-684d2a9"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.6.0-canary.20240723-c4f9d89",
-    "@nx/nx-darwin-arm64": "19.6.0-canary.20240723-c4f9d89",
-    "@nx/nx-linux-x64-gnu": "19.6.0-canary.20240723-c4f9d89",
-    "@nx/nx-linux-x64-musl": "19.6.0-canary.20240723-c4f9d89",
-    "@nx/nx-win32-x64-msvc": "19.6.0-canary.20240723-c4f9d89",
-    "@nx/nx-linux-arm64-gnu": "19.6.0-canary.20240723-c4f9d89",
-    "@nx/nx-linux-arm64-musl": "19.6.0-canary.20240723-c4f9d89",
-    "@nx/nx-linux-arm-gnueabihf": "19.6.0-canary.20240723-c4f9d89",
-    "@nx/nx-win32-arm64-msvc": "19.6.0-canary.20240723-c4f9d89",
-    "@nx/nx-freebsd-x64": "19.6.0-canary.20240723-c4f9d89"
+    "@nx/nx-darwin-x64": "19.6.0-canary.20240724-684d2a9",
+    "@nx/nx-darwin-arm64": "19.6.0-canary.20240724-684d2a9",
+    "@nx/nx-linux-x64-gnu": "19.6.0-canary.20240724-684d2a9",
+    "@nx/nx-linux-x64-musl": "19.6.0-canary.20240724-684d2a9",
+    "@nx/nx-win32-x64-msvc": "19.6.0-canary.20240724-684d2a9",
+    "@nx/nx-linux-arm64-gnu": "19.6.0-canary.20240724-684d2a9",
+    "@nx/nx-linux-arm64-musl": "19.6.0-canary.20240724-684d2a9",
+    "@nx/nx-linux-arm-gnueabihf": "19.6.0-canary.20240724-684d2a9",
+    "@nx/nx-win32-arm64-msvc": "19.6.0-canary.20240724-684d2a9",
+    "@nx/nx-freebsd-x64": "19.6.0-canary.20240724-684d2a9"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/watch/watch.js

@@ -117,7 +117,7 @@ async function watch(args) {
     if (args.verbose) {
         process.env.NX_VERBOSE_LOGGING = 'true';
     }
-    if (client_1.daemonClient.enabled()) {
+    if (!client_1.daemonClient.enabled()) {
         output_1.output.error({
             title: 'Daemon is not running. The watch command is not supported without the Nx Daemon.',
         });

package/src/tasks-runner/run-command.d.ts

@@ -1,10 +1,10 @@
-import { TasksRunner } from './tasks-runner';
-import { NxArgs } from '../utils/command-line-utils';
-import { LifeCycle } from './life-cycle';
-import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
 import { NxJsonConfiguration } from '../config/nx-json';
+import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
 import { Task, TaskGraph } from '../config/task-graph';
 import { TargetDependencyConfig } from '../config/workspace-json-project-json';
+import { NxArgs } from '../utils/command-line-utils';
+import { LifeCycle } from './life-cycle';
+import { TasksRunner } from './tasks-runner';
 export declare function runCommand(projectsToRun: ProjectGraphProjectNode[], projectGraph: ProjectGraph, { nxJson }: {
     nxJson: NxJsonConfiguration;
 }, nxArgs: NxArgs, overrides: any, initiatingProject: string | null, extraTargetDependencies: Record<string, (TargetDependencyConfig | string)[]>, extraOptions: {

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

@@ -5,28 +5,28 @@ exports.invokeTasksRunner = invokeTasksRunner;
 exports.getRunner = getRunner;
 exports.getRunnerOptions = getRunnerOptions;
 const path_1 = require("path");
-const workspace_root_1 = require("../utils/workspace-root");
+const nx_json_1 = require("../config/nx-json");
+const client_1 = require("../daemon/client/client");
+const create_task_hasher_1 = require("../hasher/create-task-hasher");
+const hash_task_1 = require("../hasher/hash-task");
 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 utils_1 = require("./utils");
+const params_1 = require("../utils/params");
+const workspace_root_1 = require("../utils/workspace-root");
+const create_task_graph_1 = require("./create-task-graph");
 const life_cycle_1 = require("./life-cycle");
-const static_run_many_terminal_output_life_cycle_1 = require("./life-cycles/static-run-many-terminal-output-life-cycle");
-const static_run_one_terminal_output_life_cycle_1 = require("./life-cycles/static-run-one-terminal-output-life-cycle");
-const task_timings_life_cycle_1 = require("./life-cycles/task-timings-life-cycle");
 const dynamic_run_many_terminal_output_life_cycle_1 = require("./life-cycles/dynamic-run-many-terminal-output-life-cycle");
-const task_profiling_life_cycle_1 = require("./life-cycles/task-profiling-life-cycle");
-const is_ci_1 = require("../utils/is-ci");
 const dynamic_run_one_terminal_output_life_cycle_1 = require("./life-cycles/dynamic-run-one-terminal-output-life-cycle");
-const nx_json_1 = require("../config/nx-json");
-const create_task_graph_1 = require("./create-task-graph");
-const task_graph_utils_1 = require("./task-graph-utils");
-const params_1 = require("../utils/params");
-const hash_task_1 = require("../hasher/hash-task");
-const client_1 = require("../daemon/client/client");
+const static_run_many_terminal_output_life_cycle_1 = require("./life-cycles/static-run-many-terminal-output-life-cycle");
+const static_run_one_terminal_output_life_cycle_1 = require("./life-cycles/static-run-one-terminal-output-life-cycle");
 const store_run_information_life_cycle_1 = require("./life-cycles/store-run-information-life-cycle");
-const create_task_hasher_1 = require("../hasher/create-task-hasher");
 const task_history_life_cycle_1 = require("./life-cycles/task-history-life-cycle");
-const nx_cloud_utils_1 = require("../utils/nx-cloud-utils");
+const task_profiling_life_cycle_1 = require("./life-cycles/task-profiling-life-cycle");
+const task_timings_life_cycle_1 = require("./life-cycles/task-timings-life-cycle");
+const task_graph_utils_1 = require("./task-graph-utils");
+const utils_1 = require("./utils");
 async function getTerminalOutputLifeCycle(initiatingProject, projectNames, tasks, nxArgs, nxJson, overrides) {
     const { runnerOptions } = getRunner(nxArgs, nxJson);
     const isRunOne = initiatingProject != null;
@@ -64,7 +64,7 @@ async function getTerminalOutputLifeCycle(initiatingProject, projectNames, tasks
         }
     }
 }
-function createTaskGraphAndValidateCycles(projectGraph, extraTargetDependencies, projectNames, nxArgs, overrides, extraOptions) {
+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);
     const cycle = (0, task_graph_utils_1.findCycle)(taskGraph);
     if (cycle) {
@@ -83,12 +83,17 @@ function createTaskGraphAndValidateCycles(projectGraph, extraTargetDependencies,
             process.exit(1);
         }
     }
+    // validate that no atomized tasks like e2e-ci are used without Nx Cloud
+    if (!(0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)()) &&
+        !process.env['NX_SKIP_ATOMIZER_VALIDATION']) {
+        (0, task_graph_utils_1.validateNoAtomizedTasks)(taskGraph, projectGraph);
+    }
     return taskGraph;
 }
 async function runCommand(projectsToRun, projectGraph, { nxJson }, nxArgs, overrides, initiatingProject, extraTargetDependencies, extraOptions) {
     const status = await (0, params_1.handleErrors)(process.env.NX_VERBOSE_LOGGING === 'true', async () => {
         const projectNames = projectsToRun.map((t) => t.name);
-        const taskGraph = createTaskGraphAndValidateCycles(projectGraph, extraTargetDependencies ?? {}, projectNames, nxArgs, overrides, extraOptions);
+        const taskGraph = createTaskGraphAndRunValidations(projectGraph, extraTargetDependencies ?? {}, projectNames, nxArgs, overrides, extraOptions);
         const tasks = Object.values(taskGraph.tasks);
         const { lifeCycle, renderIsDone } = await getTerminalOutputLifeCycle(initiatingProject, projectNames, tasks, nxArgs, nxJson, overrides);
         const status = await invokeTasksRunner({

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

@@ -1,3 +1,5 @@
+import { ProjectGraph } from '../config/project-graph';
+import { TaskGraph } from '../config/task-graph';
 export declare function findCycle(graph: {
     dependencies: Record<string, string[]>;
 }): string[] | null;
@@ -5,3 +7,4 @@ export declare function makeAcyclic(graph: {
     roots: string[];
     dependencies: Record<string, string[]>;
 }): void;
+export declare function validateNoAtomizedTasks(taskGraph: TaskGraph, projectGraph: ProjectGraph): void;

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

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findCycle = findCycle;
 exports.makeAcyclic = makeAcyclic;
+exports.validateNoAtomizedTasks = validateNoAtomizedTasks;
+const output_1 = require("../utils/output");
 function _findCycle(graph, id, visited, path) {
     if (visited[id])
         return null;
@@ -52,3 +54,35 @@ function makeAcyclic(graph) {
     }
     graph.roots = Object.keys(graph.dependencies).filter((t) => graph.dependencies[t].length === 0);
 }
+function validateNoAtomizedTasks(taskGraph, projectGraph) {
+    const getNonAtomizedTargetForTask = (task) => projectGraph.nodes[task.target.project]?.data?.targets?.[task.target.target]
+        ?.metadata?.nonAtomizedTarget;
+    const atomizedRootTasks = Object.values(taskGraph.tasks).filter((task) => getNonAtomizedTargetForTask(task) !== undefined);
+    if (atomizedRootTasks.length === 0) {
+        return;
+    }
+    const nonAtomizedTasks = atomizedRootTasks
+        .map((t) => `"${getNonAtomizedTargetForTask(t)}"`)
+        .filter((item, index, arr) => arr.indexOf(item) === index);
+    const moreInfoLines = [
+        `Please enable Nx Cloud or use the slower ${nonAtomizedTasks.join(',')} task${nonAtomizedTasks.length > 1 ? 's' : ''}.`,
+        'Learn more at https://nx.dev/ci/features/split-e2e-tasks#use-atomizer-only-with-nx-cloud-distribution',
+    ];
+    if (atomizedRootTasks.length === 1) {
+        output_1.output.error({
+            title: `The ${atomizedRootTasks[0].id} task should only be run with Nx Cloud.`,
+            bodyLines: [...moreInfoLines],
+        });
+    }
+    else {
+        output_1.output.error({
+            title: `The following tasks should only be run with Nx Cloud:`,
+            bodyLines: [
+                ...atomizedRootTasks.map((task) => `  - ${task.id}`),
+                '',
+                ...moreInfoLines,
+            ],
+        });
+    }
+    process.exit(1);
+}