nx 19.6.0-canary.20240724-684d2a9 → 19.6.0-canary.20240726-b3c67de

package/src/native/nx.wasi.cjs

@@ -88,39 +88,40 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__copy_3']?.()
   __napiInstance.exports['__napi_register__hash_array_4']?.()
   __napiInstance.exports['__napi_register__hash_file_5']?.()
-  __napiInstance.exports['__napi_register__ImportResult_struct_6']?.()
-  __napiInstance.exports['__napi_register__find_imports_7']?.()
-  __napiInstance.exports['__napi_register__transfer_project_graph_8']?.()
-  __napiInstance.exports['__napi_register__ExternalNode_struct_9']?.()
-  __napiInstance.exports['__napi_register__Target_struct_10']?.()
-  __napiInstance.exports['__napi_register__Project_struct_11']?.()
-  __napiInstance.exports['__napi_register__ProjectGraph_struct_12']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_struct_13']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_impl_17']?.()
-  __napiInstance.exports['__napi_register__HashDetails_struct_18']?.()
-  __napiInstance.exports['__napi_register__HasherOptions_struct_19']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_struct_20']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_impl_23']?.()
-  __napiInstance.exports['__napi_register__Task_struct_24']?.()
-  __napiInstance.exports['__napi_register__TaskTarget_struct_25']?.()
-  __napiInstance.exports['__napi_register__TaskGraph_struct_26']?.()
-  __napiInstance.exports['__napi_register__FileData_struct_27']?.()
-  __napiInstance.exports['__napi_register__InputsInput_struct_28']?.()
-  __napiInstance.exports['__napi_register__FileSetInput_struct_29']?.()
-  __napiInstance.exports['__napi_register__RuntimeInput_struct_30']?.()
-  __napiInstance.exports['__napi_register__EnvironmentInput_struct_31']?.()
-  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_32']?.()
-  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_33']?.()
-  __napiInstance.exports['__napi_register__NxJson_struct_34']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_35']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_44']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_45']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_46']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_47']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_48']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_49']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_50']?.()
-  __napiInstance.exports['__napi_register__IS_WASM_51']?.()
+  __napiInstance.exports['__napi_register__IS_WASM_6']?.()
+  __napiInstance.exports['__napi_register__get_binary_target_7']?.()
+  __napiInstance.exports['__napi_register__ImportResult_struct_8']?.()
+  __napiInstance.exports['__napi_register__find_imports_9']?.()
+  __napiInstance.exports['__napi_register__transfer_project_graph_10']?.()
+  __napiInstance.exports['__napi_register__ExternalNode_struct_11']?.()
+  __napiInstance.exports['__napi_register__Target_struct_12']?.()
+  __napiInstance.exports['__napi_register__Project_struct_13']?.()
+  __napiInstance.exports['__napi_register__ProjectGraph_struct_14']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_struct_15']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_impl_19']?.()
+  __napiInstance.exports['__napi_register__HashDetails_struct_20']?.()
+  __napiInstance.exports['__napi_register__HasherOptions_struct_21']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_struct_22']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_impl_25']?.()
+  __napiInstance.exports['__napi_register__Task_struct_26']?.()
+  __napiInstance.exports['__napi_register__TaskTarget_struct_27']?.()
+  __napiInstance.exports['__napi_register__TaskGraph_struct_28']?.()
+  __napiInstance.exports['__napi_register__FileData_struct_29']?.()
+  __napiInstance.exports['__napi_register__InputsInput_struct_30']?.()
+  __napiInstance.exports['__napi_register__FileSetInput_struct_31']?.()
+  __napiInstance.exports['__napi_register__RuntimeInput_struct_32']?.()
+  __napiInstance.exports['__napi_register__EnvironmentInput_struct_33']?.()
+  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_34']?.()
+  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_35']?.()
+  __napiInstance.exports['__napi_register__NxJson_struct_36']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_struct_37']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_impl_46']?.()
+  __napiInstance.exports['__napi_register__WorkspaceErrors_47']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_48']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_49']?.()
+  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_50']?.()
+  __napiInstance.exports['__napi_register__FileMap_struct_51']?.()
+  __napiInstance.exports['__napi_register____test_only_transfer_file_map_52']?.()
 }
 module.exports.HashPlanner = __napiModule.exports.HashPlanner
 module.exports.ImportResult = __napiModule.exports.ImportResult
@@ -129,6 +130,7 @@ module.exports.WorkspaceContext = __napiModule.exports.WorkspaceContext
 module.exports.copy = __napiModule.exports.copy
 module.exports.expandOutputs = __napiModule.exports.expandOutputs
 module.exports.findImports = __napiModule.exports.findImports
+module.exports.getBinaryTarget = __napiModule.exports.getBinaryTarget
 module.exports.getFilesForOutputs = __napiModule.exports.getFilesForOutputs
 module.exports.hashArray = __napiModule.exports.hashArray
 module.exports.hashFile = __napiModule.exports.hashFile

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

@@ -8,7 +8,6 @@ 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");
 function printCloudConnectionDisabledMessage() {
@@ -55,7 +54,7 @@ async function createNxCloudWorkspace(workspaceName, installationSource, nxInitD
     }
     return response.data;
 }
-async function printSuccessMessage(url, token, installationSource, usesGithub, directory) {
+async function printSuccessMessage(token, installationSource, usesGithub) {
     const connectCloudUrl = await (0, url_shorten_1.shortenedCloudUrl)(installationSource, token, usesGithub);
     if (installationSource === 'nx-connect' && usesGithub) {
         try {
@@ -88,12 +87,6 @@ async function printSuccessMessage(url, token, installationSource, usesGithub, d
                     `${connectCloudUrl}`,
                 ],
             });
-            (0, git_utils_1.commitChanges)(`feat(nx): Added Nx Cloud token to your nx.json
-          
-          To connect your workspace to Nx Cloud, push your repository 
-          to your git hosting provider and go to the following URL:   
-          
-          ${connectCloudUrl}`, directory);
         }
         else {
             output_1.output.note({
@@ -141,8 +134,7 @@ async function connectToNxCloud(tree, schema) {
                 silent: schema.hideFormatLogs,
             });
         }
-        const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
-        return async () => await printSuccessMessage(responseFromCreateNxCloudWorkspace?.url ?? apiUrl, responseFromCreateNxCloudWorkspace?.token, schema.installationSource, usesGithub, schema.directory);
+        return async () => await printSuccessMessage(responseFromCreateNxCloudWorkspace?.token, schema.installationSource, usesGithub);
     }
 }
 function sleep(ms) {

package/src/nx-cloud/utilities/client.d.ts

@@ -0,0 +1,10 @@
+import { CloudTaskRunnerOptions } from '../nx-cloud-tasks-runner-shell';
+export declare class UnknownCommandError extends Error {
+    command: string;
+    availableCommands: string[];
+    constructor(command: string, availableCommands: string[]);
+}
+export declare function getCloudClient(options: CloudTaskRunnerOptions): Promise<{
+    invoke: (command: string) => void;
+    availableCommands: string[];
+}>;

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

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnknownCommandError = void 0;
+exports.getCloudClient = getCloudClient;
+const resolution_helpers_1 = require("../resolution-helpers");
+const update_manager_1 = require("../update-manager");
+class UnknownCommandError extends Error {
+    constructor(command, availableCommands) {
+        super(`Unknown Command "${command}"`);
+        this.command = command;
+        this.availableCommands = availableCommands;
+    }
+}
+exports.UnknownCommandError = UnknownCommandError;
+async function getCloudClient(options) {
+    const { nxCloudClient } = await (0, update_manager_1.verifyOrUpdateNxCloudClient)(options);
+    const paths = (0, resolution_helpers_1.findAncestorNodeModules)(__dirname, []);
+    nxCloudClient.configureLightClientRequire()(paths);
+    return {
+        invoke: (command) => {
+            if (command in nxCloudClient.commands) {
+                nxCloudClient.commands[command]()
+                    .then(() => process.exit(0))
+                    .catch((e) => {
+                    console.error(e);
+                    process.exit(1);
+                });
+            }
+            else {
+                throw new UnknownCommandError(command, Object.keys(nxCloudClient.commands));
+            }
+        },
+        availableCommands: Object.keys(nxCloudClient.commands),
+    };
+}

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

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

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

@@ -13,6 +13,9 @@ const get_cloud_options_1 = require("./get-cloud-options");
 async function shortenedCloudUrl(installationSource, accessToken, usesGithub) {
     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) ||
@@ -31,7 +34,7 @@ async function shortenedCloudUrl(installationSource, accessToken, usesGithub) {
             type: usesGithub ? 'GITHUB' : 'MANUAL',
             source,
             accessToken: usesGithub ? null : accessToken,
-            selectedRepositoryName: githubSlug,
+            selectedRepositoryName: githubSlug === 'github' ? null : githubSlug,
         });
         if (!response?.data || response.data.message) {
             throw new Error(response?.data?.message ?? 'Failed to shorten Nx Cloud URL');
@@ -41,14 +44,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));

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/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[];