nx 19.6.0-canary.20240720-9410164 → 19.6.0-canary.20240724-684d2a9

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

@@ -7,6 +7,7 @@ const json_1 = require("../../../generators/utils/json");
 const nx_json_1 = require("../../../generators/utils/nx-json");
 const format_changed_files_with_prettier_if_available_1 = require("../../../generators/internal-utils/format-changed-files-with-prettier-if-available");
 const url_shorten_1 = require("../../utilities/url-shorten");
+const get_cloud_options_1 = require("../../utilities/get-cloud-options");
 const git_utils_1 = require("../../../utils/git-utils");
 const ora = require("ora");
 const open = require("open");
@@ -30,11 +31,6 @@ function getRootPackageName(tree) {
     catch (e) { }
     return packageJson?.name ?? 'my-workspace';
 }
-function removeTrailingSlash(apiUrl) {
-    return apiUrl[apiUrl.length - 1] === '/'
-        ? apiUrl.substr(0, apiUrl.length - 1)
-        : apiUrl;
-}
 function getNxInitDate() {
     try {
         const nxInitIso = (0, child_process_1.execSync)('git log --diff-filter=A --follow --format=%aI -- nx.json | tail -1', { stdio: 'pipe' })
@@ -48,7 +44,7 @@ function getNxInitDate() {
     }
 }
 async function createNxCloudWorkspace(workspaceName, installationSource, nxInitDate) {
-    const apiUrl = removeTrailingSlash(process.env.NX_CLOUD_API || process.env.NRWL_API || `https://cloud.nx.app`);
+    const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
     const response = await require('axios').post(`${apiUrl}/nx-cloud/create-org-and-workspace`, {
         workspaceName,
         installationSource,
@@ -145,7 +141,7 @@ async function connectToNxCloud(tree, schema) {
                 silent: schema.hideFormatLogs,
             });
         }
-        const apiUrl = removeTrailingSlash(process.env.NX_CLOUD_API || process.env.NRWL_API || `https://cloud.nx.app`);
+        const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
         return async () => await printSuccessMessage(responseFromCreateNxCloudWorkspace?.url ?? apiUrl, responseFromCreateNxCloudWorkspace?.token, schema.installationSource, usesGithub, schema.directory);
     }
 }

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

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

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

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCloudOptions = getCloudOptions;
+exports.getCloudUrl = getCloudUrl;
+exports.removeTrailingSlash = removeTrailingSlash;
 const nx_json_1 = require("../../config/nx-json");
 const run_command_1 = require("../../tasks-runner/run-command");
 function getCloudOptions() {
@@ -8,3 +10,9 @@ function getCloudOptions() {
     // TODO: The default is not always cloud? But it's not handled at the moment
     return (0, run_command_1.getRunnerOptions)('default', nxJson, {}, true);
 }
+function getCloudUrl() {
+    return removeTrailingSlash(process.env.NX_CLOUD_API || process.env.NRWL_API || `https://cloud.nx.app`);
+}
+function removeTrailingSlash(apiUrl) {
+    return apiUrl[apiUrl.length - 1] === '/' ? apiUrl.slice(0, -1) : apiUrl;
+}

package/src/nx-cloud/utilities/url-shorten.d.ts

@@ -1,6 +1,5 @@
 export declare function shortenedCloudUrl(installationSource: string, accessToken?: string, usesGithub?: boolean): Promise<string>;
 export declare function repoUsesGithub(github?: boolean): Promise<boolean>;
-export declare function removeTrailingSlash(apiUrl: string): string;
 export declare function getURLifShortenFailed(usesGithub: boolean, githubSlug: string, apiUrl: string, source: string, accessToken?: string): string;
 export declare function getNxCloudVersion(apiUrl: string): Promise<string | null>;
 export declare function removeVersionModifier(versionString: string): string;

package/src/nx-cloud/utilities/url-shorten.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.shortenedCloudUrl = shortenedCloudUrl;
 exports.repoUsesGithub = repoUsesGithub;
-exports.removeTrailingSlash = removeTrailingSlash;
 exports.getURLifShortenFailed = getURLifShortenFailed;
 exports.getNxCloudVersion = getNxCloudVersion;
 exports.removeVersionModifier = removeVersionModifier;
@@ -10,9 +9,10 @@ exports.versionIsValid = versionIsValid;
 exports.compareCleanCloudVersions = compareCleanCloudVersions;
 const devkit_exports_1 = require("../../devkit-exports");
 const git_utils_1 = require("../../utils/git-utils");
+const get_cloud_options_1 = require("./get-cloud-options");
 async function shortenedCloudUrl(installationSource, accessToken, usesGithub) {
     const githubSlug = (0, git_utils_1.getGithubSlugOrNull)();
-    const apiUrl = removeTrailingSlash(process.env.NX_CLOUD_API || process.env.NRWL_API || `https://cloud.nx.app`);
+    const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
     try {
         const version = await getNxCloudVersion(apiUrl);
         if ((version && compareCleanCloudVersions(version, '2406.11.5') < 0) ||
@@ -46,16 +46,13 @@ async function shortenedCloudUrl(installationSource, accessToken, usesGithub) {
 }
 async function repoUsesGithub(github) {
     const githubSlug = (0, git_utils_1.getGithubSlugOrNull)();
-    const apiUrl = removeTrailingSlash(process.env.NX_CLOUD_API || process.env.NRWL_API || `https://cloud.nx.app`);
+    const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
     const installationSupportsGitHub = await getInstallationSupportsGitHub(apiUrl);
     return ((githubSlug || github) &&
         (apiUrl.includes('cloud.nx.app') ||
             apiUrl.includes('eu.nx.app') ||
             installationSupportsGitHub));
 }
-function removeTrailingSlash(apiUrl) {
-    return apiUrl[apiUrl.length - 1] === '/' ? apiUrl.slice(0, -1) : apiUrl;
-}
 function getSource(installationSource) {
     if (installationSource.includes('nx-init')) {
         return 'nx-init';

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);
+}

package/src/utils/ab-testing.d.ts

@@ -46,6 +46,6 @@ export declare function recordStat(opts: {
     command: string;
     nxVersion: string;
     useCloud: boolean;
-    meta: string;
+    meta?: string;
 }): Promise<void>;
 export {};

package/src/utils/ab-testing.js

@@ -5,6 +5,7 @@ exports.recordStat = recordStat;
 const node_child_process_1 = require("node:child_process");
 const is_ci_1 = require("./is-ci");
 const package_manager_1 = require("./package-manager");
+const get_cloud_options_1 = require("../nx-cloud/utilities/get-cloud-options");
 const messageOptions = {
     setupNxCloud: [
         {
@@ -72,7 +73,7 @@ async function recordStat(opts) {
         const axios = require('axios');
         await (axios['default'] ?? axios)
             .create({
-            baseURL: 'https://cloud.nx.app',
+            baseURL: (0, get_cloud_options_1.getCloudUrl)(),
             timeout: 400,
         })
             .post('/nx-cloud/stats', {