nx 19.5.1 → 19.5.2

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/utils.js

@@ -136,7 +136,6 @@ function normalizeTargetDependencyWithStringProjects(dependencyConfig) {
         else if (dependencyConfig.projects === 'dependencies') {
             dependencyConfig.dependencies = true;
             delete dependencyConfig.projects;
-            return;
             /** LERNA SUPPORT END - Remove in v20 */
         }
         else {

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', {

package/src/utils/plugins/plugin-capabilities.js

@@ -114,7 +114,7 @@ async function listPluginCapabilities(pluginName, projects) {
     if (hasBuilders) {
         bodyLines.push(chalk.bold(chalk.green('EXECUTORS/BUILDERS')));
         bodyLines.push('');
-        bodyLines.push(...Object.keys(plugin.executors).map((name) => `${chalk.bold(name)} : ${resolveExecutorDescription(plugin.executors[name], projects)}`));
+        bodyLines.push(...Object.keys(plugin.executors).map((name) => `${chalk.bold(name)} : ${resolveExecutorDescription(pluginName, plugin.executors[name], projects)}`));
     }
     if (hasProjectGraphExtension) {
         bodyLines.push(`✔️  Project Graph Extension`);
@@ -127,13 +127,20 @@ async function listPluginCapabilities(pluginName, projects) {
         bodyLines,
     });
 }
-function resolveExecutorDescription(executorJsonEntry, projects) {
+function resolveExecutorDescription(pluginName, executorJsonEntry, projects, requirePaths = (0, installation_directory_1.getNxRequirePaths)(workspace_root_1.workspaceRoot)) {
     try {
         if (typeof executorJsonEntry === 'string') {
             // it points to another executor, resolve it
             const [pkgName, executor] = executorJsonEntry.split(':');
-            const collection = loadExecutorsCollection(workspace_root_1.workspaceRoot, pkgName, projects);
-            return resolveExecutorDescription(collection[executor], projects);
+            // read the package.json of the parent plugin
+            const { path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(pluginName, projects, requirePaths);
+            // accumulate the require paths to resolve nested packages
+            const cummulativeRequirePaths = [
+                ...requirePaths,
+                (0, path_1.dirname)(packageJsonPath),
+            ];
+            const collection = loadExecutorsCollection(pkgName, projects, cummulativeRequirePaths);
+            return resolveExecutorDescription(pkgName, collection[executor], projects, cummulativeRequirePaths);
         }
         return executorJsonEntry.description;
     }
@@ -141,8 +148,8 @@ function resolveExecutorDescription(executorJsonEntry, projects) {
         return 'No description available';
     }
 }
-function loadExecutorsCollection(workspaceRoot, pluginName, projects) {
-    const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(pluginName, projects, (0, installation_directory_1.getNxRequirePaths)(workspaceRoot));
+function loadExecutorsCollection(pluginName, projects, requirePaths) {
+    const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(pluginName, projects, requirePaths);
     return {
         ...tryGetCollection(packageJsonPath, packageJson.builders, 'builders'),
         ...tryGetCollection(packageJsonPath, packageJson.executors, 'builders'),