nx 19.5.2 → 19.5.4

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shortenedCloudUrl = shortenedCloudUrl;
+exports.createNxCloudOnboardingURL = createNxCloudOnboardingURL;
 exports.repoUsesGithub = repoUsesGithub;
 exports.getURLifShortenFailed = getURLifShortenFailed;
 exports.getNxCloudVersion = getNxCloudVersion;
@@ -10,9 +10,12 @@ 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) {
+async function createNxCloudOnboardingURL(onboardingSource, accessToken, usesGithub, meta) {
     const githubSlug = (0, git_utils_1.getGithubSlugOrNull)();
     const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
+    if (usesGithub === undefined || usesGithub === null) {
+        usesGithub = await repoUsesGithub(undefined, githubSlug, apiUrl);
+    }
     try {
         const version = await getNxCloudVersion(apiUrl);
         if ((version && compareCleanCloudVersions(version, '2406.11.5') < 0) ||
@@ -25,13 +28,14 @@ async function shortenedCloudUrl(installationSource, accessToken, usesGithub) {
     ${e}`);
         return apiUrl;
     }
-    const source = getSource(installationSource);
+    const source = getSource(onboardingSource);
     try {
         const response = await require('axios').post(`${apiUrl}/nx-cloud/onboarding`, {
             type: usesGithub ? 'GITHUB' : 'MANUAL',
             source,
             accessToken: usesGithub ? null : accessToken,
-            selectedRepositoryName: githubSlug,
+            selectedRepositoryName: githubSlug === 'github' ? null : githubSlug,
+            meta,
         });
         if (!response?.data || response.data.message) {
             throw new Error(response?.data?.message ?? 'Failed to shorten Nx Cloud URL');
@@ -41,14 +45,18 @@ async function shortenedCloudUrl(installationSource, accessToken, usesGithub) {
     catch (e) {
         devkit_exports_1.logger.verbose(`Failed to shorten Nx Cloud URL.
     ${e}`);
-        return getURLifShortenFailed(usesGithub, githubSlug, apiUrl, source, accessToken);
+        return getURLifShortenFailed(usesGithub, githubSlug === 'github' ? null : githubSlug, apiUrl, source, accessToken);
     }
 }
-async function repoUsesGithub(github) {
-    const githubSlug = (0, git_utils_1.getGithubSlugOrNull)();
-    const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
+async function repoUsesGithub(github, githubSlug, apiUrl) {
+    if (!apiUrl) {
+        apiUrl = (0, get_cloud_options_1.getCloudUrl)();
+    }
+    if (!githubSlug) {
+        githubSlug = (0, git_utils_1.getGithubSlugOrNull)();
+    }
     const installationSupportsGitHub = await getInstallationSupportsGitHub(apiUrl);
-    return ((githubSlug || github) &&
+    return ((!!githubSlug || !!github) &&
         (apiUrl.includes('cloud.nx.app') ||
             apiUrl.includes('eu.nx.app') ||
             installationSupportsGitHub));
@@ -60,11 +68,8 @@ function getSource(installationSource) {
     else if (installationSource.includes('nx-connect')) {
         return 'nx-connect';
     }
-    else if (installationSource.includes('create-nx-workspace')) {
-        return 'create-nx-workspace';
-    }
     else {
-        return 'other';
+        return installationSource;
     }
 }
 function getURLifShortenFailed(usesGithub, githubSlug, apiUrl, source, accessToken) {

package/src/project-graph/plugins/internal-api.js

@@ -13,6 +13,7 @@ const loader_1 = require("./loader");
 const utils_1 = require("./utils");
 const error_types_1 = require("../error-types");
 const native_1 = require("../../native");
+const os_1 = require("os");
 class LoadedNxPlugin {
     constructor(plugin, pluginDefinition) {
         this.name = plugin.name;
@@ -74,7 +75,9 @@ exports.nxPluginCache = new Map();
 async function loadNxPlugins(plugins, root = workspace_root_1.workspaceRoot) {
     performance.mark('loadNxPlugins:start');
     const loadingMethod = process.env.NX_ISOLATE_PLUGINS === 'true' ||
-        (!native_1.IS_WASM && process.env.NX_ISOLATE_PLUGINS !== 'false')
+        (!native_1.IS_WASM &&
+            (0, os_1.platform)() !== 'win32' &&
+            process.env.NX_ISOLATE_PLUGINS !== 'false')
         ? isolation_1.loadNxPluginInIsolation
         : loader_1.loadNxPlugin;
     plugins = await normalizePlugins(plugins, root);

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-env.js

@@ -8,6 +8,7 @@ exports.unloadDotEnvFile = unloadDotEnvFile;
 const dotenv_1 = require("dotenv");
 const dotenv_expand_1 = require("dotenv-expand");
 const workspace_root_1 = require("../utils/workspace-root");
+const node_path_1 = require("node:path");
 function getEnvVariablesForBatchProcess(skipNxCache, captureStderr) {
     return {
         // User Process Env Variables override Dotenv Variables
@@ -158,13 +159,13 @@ function getEnvFilesForTask(task) {
 function loadDotEnvFilesForTask(task, environmentVariables) {
     const dotEnvFiles = getEnvFilesForTask(task);
     for (const file of dotEnvFiles) {
-        loadAndExpandDotEnvFile(file, environmentVariables);
+        loadAndExpandDotEnvFile((0, node_path_1.join)(workspace_root_1.workspaceRoot, file), environmentVariables);
     }
     return environmentVariables;
 }
 function unloadDotEnvFiles(environmentVariables) {
     for (const file of ['.env', '.local.env', '.env.local']) {
-        unloadDotEnvFile(file, environmentVariables);
+        unloadDotEnvFile((0, node_path_1.join)(workspace_root_1.workspaceRoot, file), environmentVariables);
     }
     return environmentVariables;
 }

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#nx-cloud-is-required-to-run-atomized-tasks',
+    ];
+    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/tasks-runner/utils.js

@@ -215,16 +215,20 @@ function getOutputsForTargetAndConfiguration(taskTargetOrTask, overridesOrNode,
     };
     if (targetConfiguration?.outputs) {
         validateOutputs(targetConfiguration.outputs);
-        return targetConfiguration.outputs
-            .map((output) => {
-            return interpolate(output, {
+        const result = new Set();
+        for (const output of targetConfiguration.outputs) {
+            const interpolatedOutput = interpolate(output, {
                 projectRoot: node.data.root,
                 projectName: node.name,
                 project: { ...node.data, name: node.name }, // this is legacy
                 options,
             });
-        })
-            .filter((output) => !!output && !output.match(/{(projectRoot|workspaceRoot|(options.*))}/));
+            if (!!interpolatedOutput &&
+                !interpolatedOutput.match(/{(projectRoot|workspaceRoot|(options.*))}/)) {
+                result.add(interpolatedOutput);
+            }
+        }
+        return Array.from(result);
     }
     // Keep backwards compatibility in case `outputs` doesn't exist
     if (options.outputPath) {

package/src/utils/chunkify.d.ts

@@ -1 +1,11 @@
 export declare function chunkify(target: string[], maxChunkLength?: number): string[][];
+/**
+ * Get the maximum length of a command-line argument string based on current platform
+ *
+ * https://serverfault.com/questions/69430/what-is-the-maximum-length-of-a-command-line-in-mac-os-x
+ * https://support.microsoft.com/en-us/help/830473/command-prompt-cmd-exe-command-line-string-limitation
+ * https://unix.stackexchange.com/a/120652
+ *
+ * Taken from: https://github.com/lint-staged/lint-staged/blob/adf50b00669f6aac2eeca25dd28ff86a9a3c2a48/lib/index.js#L21-L37
+ */
+export declare function getMaxArgLength(): 262144 | 8191 | 131072;

package/src/utils/chunkify.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chunkify = chunkify;
-const child_process_1 = require("child_process");
-const TERMINAL_SIZE = process.platform === 'win32' ? 8192 : getUnixTerminalSize();
+exports.getMaxArgLength = getMaxArgLength;
+const TERMINAL_SIZE = getMaxArgLength();
 function chunkify(target, maxChunkLength = TERMINAL_SIZE - 500) {
     const chunks = [];
     let currentChunk = [];
@@ -23,15 +23,22 @@ function chunkify(target, maxChunkLength = TERMINAL_SIZE - 500) {
     chunks.push(currentChunk);
     return chunks;
 }
-function getUnixTerminalSize() {
-    try {
-        const argMax = (0, child_process_1.execSync)('getconf ARG_MAX').toString().trim();
-        return Number.parseInt(argMax);
-    }
-    catch {
-        // This number varies by system, but 100k seems like a safe
-        // number from some research...
-        // https://stackoverflow.com/questions/19354870/bash-command-line-and-input-limit
-        return 100000;
+/**
+ * Get the maximum length of a command-line argument string based on current platform
+ *
+ * https://serverfault.com/questions/69430/what-is-the-maximum-length-of-a-command-line-in-mac-os-x
+ * https://support.microsoft.com/en-us/help/830473/command-prompt-cmd-exe-command-line-string-limitation
+ * https://unix.stackexchange.com/a/120652
+ *
+ * Taken from: https://github.com/lint-staged/lint-staged/blob/adf50b00669f6aac2eeca25dd28ff86a9a3c2a48/lib/index.js#L21-L37
+ */
+function getMaxArgLength() {
+    switch (process.platform) {
+        case 'darwin':
+            return 262144;
+        case 'win32':
+            return 8191;
+        default:
+            return 131072;
     }
 }

package/src/utils/command-line-utils.d.ts

@@ -41,6 +41,9 @@ export declare function splitArgsIntoNxArgsAndOverrides(args: {
         __overrides_unparsed__: string[];
     };
 };
+export declare function readParallelFromArgsAndEnv(args: {
+    [k: string]: any;
+}): number;
 export declare function parseFiles(options: NxArgs): {
     files: string[];
 };

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOverrides = createOverrides;
 exports.splitArgsIntoNxArgsAndOverrides = splitArgsIntoNxArgsAndOverrides;
+exports.readParallelFromArgsAndEnv = readParallelFromArgsAndEnv;
 exports.parseFiles = parseFiles;
 exports.getProjectRoots = getProjectRoots;
 exports.readGraphFileFromGraphArg = readGraphFileFromGraphArg;
@@ -112,23 +113,26 @@ function splitArgsIntoNxArgsAndOverrides(args, mode, options = { printWarnings:
         nxArgs.skipNxCache = process.env.NX_SKIP_NX_CACHE === 'true';
     }
     normalizeNxArgsRunner(nxArgs, nxJson, options);
+    nxArgs['parallel'] = readParallelFromArgsAndEnv(args);
+    return { nxArgs, overrides };
+}
+function readParallelFromArgsAndEnv(args) {
     if (args['parallel'] === 'false' || args['parallel'] === false) {
-        nxArgs['parallel'] = 1;
+        return 1;
     }
     else if (args['parallel'] === 'true' ||
         args['parallel'] === true ||
         args['parallel'] === '' ||
-        process.env.NX_PARALLEL // dont require passing --parallel if NX_PARALLEL is set
-    ) {
-        nxArgs['parallel'] = Number(nxArgs['maxParallel'] ||
-            nxArgs['max-parallel'] ||
+        // dont require passing --parallel if NX_PARALLEL is set, but allow overriding it
+        (process.env.NX_PARALLEL && args['parallel'] === undefined)) {
+        return Number(args['maxParallel'] ||
+            args['max-parallel'] ||
             process.env.NX_PARALLEL ||
             3);
     }
     else if (args['parallel'] !== undefined) {
-        nxArgs['parallel'] = Number(args['parallel']);
+        return Number(args['parallel']);
     }
-    return { nxArgs, overrides };
 }
 function normalizeNxArgsRunner(nxArgs, nxJson, options) {
     if (!nxArgs.runner) {

package/src/utils/git-utils.js

@@ -9,26 +9,36 @@ const devkit_exports_1 = require("../devkit-exports");
 function getGithubSlugOrNull() {
     try {
         const gitRemote = (0, child_process_1.execSync)('git remote -v').toString();
+        // If there are no remotes, we default to github
+        if (!gitRemote || gitRemote.length === 0) {
+            return 'github';
+        }
         return extractUserAndRepoFromGitHubUrl(gitRemote);
     }
     catch (e) {
-        return null;
+        // Probably git is not set up, so we default to github
+        return 'github';
     }
 }
 function extractUserAndRepoFromGitHubUrl(gitRemotes) {
     const regex = /^\s*(\w+)\s+(git@github\.com:|https:\/\/github\.com\/)([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)\.git/gm;
+    const remotesPriority = ['origin', 'upstream', 'base'];
+    const foundRemotes = {};
     let firstGitHubUrl = null;
     let match;
     while ((match = regex.exec(gitRemotes)) !== null) {
         const remoteName = match[1];
         const url = match[2] + match[3] + '/' + match[4] + '.git';
-        if (remoteName === 'origin') {
-            return parseGitHubUrl(url);
-        }
+        foundRemotes[remoteName] = url;
         if (!firstGitHubUrl) {
             firstGitHubUrl = url;
         }
     }
+    for (const remote of remotesPriority) {
+        if (foundRemotes[remote]) {
+            return parseGitHubUrl(foundRemotes[remote]);
+        }
+    }
     return firstGitHubUrl ? parseGitHubUrl(firstGitHubUrl) : null;
 }
 function parseGitHubUrl(url) {

package/src/utils/plugins/core-plugins.d.ts

@@ -1,3 +1,6 @@
-import type { CorePlugin, PluginCapabilities } from './models';
-export declare function fetchCorePlugins(): CorePlugin[];
-export declare function listCorePlugins(installedPlugins: Map<string, PluginCapabilities>, corePlugins: CorePlugin[]): void;
+export interface CorePlugin {
+    name: string;
+    capabilities: 'executors' | 'generators' | 'executors,generators' | 'graph';
+    link?: string;
+}
+export declare const CORE_PLUGINS: CorePlugin[];