nx 19.5.1 → 19.6.0-canary.20240719-83b88a1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.5.1",
+  "version": "19.6.0-canary.20240719-83b88a1",
   "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.5.1"
+    "@nrwl/tao": "19.6.0-canary.20240719-83b88a1"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.5.1",
-    "@nx/nx-darwin-arm64": "19.5.1",
-    "@nx/nx-linux-x64-gnu": "19.5.1",
-    "@nx/nx-linux-x64-musl": "19.5.1",
-    "@nx/nx-win32-x64-msvc": "19.5.1",
-    "@nx/nx-linux-arm64-gnu": "19.5.1",
-    "@nx/nx-linux-arm64-musl": "19.5.1",
-    "@nx/nx-linux-arm-gnueabihf": "19.5.1",
-    "@nx/nx-win32-arm64-msvc": "19.5.1",
-    "@nx/nx-freebsd-x64": "19.5.1"
+    "@nx/nx-darwin-x64": "19.6.0-canary.20240719-83b88a1",
+    "@nx/nx-darwin-arm64": "19.6.0-canary.20240719-83b88a1",
+    "@nx/nx-linux-x64-gnu": "19.6.0-canary.20240719-83b88a1",
+    "@nx/nx-linux-x64-musl": "19.6.0-canary.20240719-83b88a1",
+    "@nx/nx-win32-x64-msvc": "19.6.0-canary.20240719-83b88a1",
+    "@nx/nx-linux-arm64-gnu": "19.6.0-canary.20240719-83b88a1",
+    "@nx/nx-linux-arm64-musl": "19.6.0-canary.20240719-83b88a1",
+    "@nx/nx-linux-arm-gnueabihf": "19.6.0-canary.20240719-83b88a1",
+    "@nx/nx-win32-arm64-msvc": "19.6.0-canary.20240719-83b88a1",
+    "@nx/nx-freebsd-x64": "19.6.0-canary.20240719-83b88a1"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/adapter/ngcli-adapter.js

@@ -799,13 +799,16 @@ async function getWrappedWorkspaceNodeModulesArchitectHost(workspace, root, proj
                 import: (0, schema_utils_1.resolveImplementation)(executorConfig.implementation, (0, path_1.dirname)(executorsFilePath)),
             };
         }
-        readExecutorsJson(nodeModule, builder) {
-            const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(nodeModule, this.projects, this.root ? [this.root, __dirname] : [__dirname]);
+        readExecutorsJson(nodeModule, builder, extraRequirePaths = []) {
+            const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(nodeModule, this.projects, this.root
+                ? [this.root, __dirname, ...extraRequirePaths]
+                : [__dirname, ...extraRequirePaths]);
             const executorsFile = packageJson.executors ?? packageJson.builders;
             if (!executorsFile) {
                 throw new Error(`The "${nodeModule}" package does not support Nx executors or Angular Devkit Builders.`);
             }
-            const executorsFilePath = require.resolve((0, path_1.join)((0, path_1.dirname)(packageJsonPath), executorsFile));
+            const basePath = (0, path_1.dirname)(packageJsonPath);
+            const executorsFilePath = require.resolve((0, path_1.join)(basePath, executorsFile));
             const executorsJson = (0, fileutils_1.readJsonFile)(executorsFilePath);
             const executorConfig = executorsJson.builders?.[builder] ?? executorsJson.executors?.[builder];
             if (!executorConfig) {
@@ -814,7 +817,7 @@ async function getWrappedWorkspaceNodeModulesArchitectHost(workspace, root, proj
             if (typeof executorConfig === 'string') {
                 // Angular CLI can have a builder pointing to another package:builder
                 const [packageName, executorName] = executorConfig.split(':');
-                return this.readExecutorsJson(packageName, executorName);
+                return this.readExecutorsJson(packageName, executorName, [basePath]);
             }
             return { executorsFilePath, executorConfig, isNgCompat: true };
         }

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

@@ -53,15 +53,22 @@ function getExecutorInformation(nodeModule, executor, root, projects) {
         throw new Error(`Unable to resolve ${nodeModule}:${executor}.\n${e.message}`);
     }
 }
-function readExecutorJson(nodeModule, executor, root, projects) {
+function readExecutorJson(nodeModule, executor, root, projects, extraRequirePaths = []) {
     const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(nodeModule, projects, root
-        ? [root, __dirname, process.cwd(), ...(0, installation_directory_1.getNxRequirePaths)()]
-        : [__dirname, process.cwd(), ...(0, installation_directory_1.getNxRequirePaths)()]);
+        ? [
+            root,
+            __dirname,
+            process.cwd(),
+            ...(0, installation_directory_1.getNxRequirePaths)(),
+            ...extraRequirePaths,
+        ]
+        : [__dirname, process.cwd(), ...(0, installation_directory_1.getNxRequirePaths)(), ...extraRequirePaths]);
     const executorsFile = packageJson.executors ?? packageJson.builders;
     if (!executorsFile) {
         throw new Error(`The "${nodeModule}" package does not support Nx executors.`);
     }
-    const executorsFilePath = require.resolve((0, path_1.join)((0, path_1.dirname)(packageJsonPath), executorsFile));
+    const basePath = (0, path_1.dirname)(packageJsonPath);
+    const executorsFilePath = require.resolve((0, path_1.join)(basePath, executorsFile));
     const executorsJson = (0, fileutils_1.readJsonFile)(executorsFilePath);
     const executorConfig = executorsJson.executors?.[executor] || executorsJson.builders?.[executor];
     if (!executorConfig) {
@@ -70,7 +77,9 @@ function readExecutorJson(nodeModule, executor, root, projects) {
     if (typeof executorConfig === 'string') {
         // Angular CLI can have a builder pointing to another package:builder
         const [packageName, executorName] = executorConfig.split(':');
-        return readExecutorJson(packageName, executorName, root, projects);
+        return readExecutorJson(packageName, executorName, root, projects, [
+            basePath,
+        ]);
     }
     const isNgCompat = !executorsJson.executors?.[executor];
     return { executorsFilePath, executorConfig, isNgCompat };

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