nx 18.1.0-canary.20240307-84d96cc → 18.1.0-canary.20240309-235ca8c

package/src/project-graph/plugins/worker-api.d.ts

@@ -1,12 +1,7 @@
 import { ProjectConfiguration } from '../../config/workspace-json-project-json';
-import { PluginConfiguration } from '../../config/nx-json';
 import { PackageJson } from '../../utils/package-json';
 import { NxPlugin } from './public-api';
-export type LoadedNxPlugin = {
-    plugin: NxPlugin;
-    options?: unknown;
-};
-export declare function loadNxPluginAsync(pluginConfiguration: PluginConfiguration, paths: string[], projects: Record<string, ProjectConfiguration>, root: string): Promise<LoadedNxPlugin>;
+import { PluginConfiguration } from '../../config/nx-json';
 export declare function readPluginPackageJson(pluginName: string, projects: Record<string, ProjectConfiguration>, paths?: string[]): {
     path: string;
     json: PackageJson;
@@ -24,3 +19,10 @@ export declare function getPluginPathAndName(moduleName: string, paths: string[]
     pluginPath: string;
     name: any;
 };
+export declare function loadPlugins(plugins: PluginConfiguration[], root: string): Promise<LoadedNxPlugin[]>;
+export declare function loadPlugin(plugin: PluginConfiguration, root: string): Promise<LoadedNxPlugin>;
+export type LoadedNxPlugin = {
+    plugin: NxPlugin;
+    options?: unknown;
+};
+export declare function loadNxPluginAsync(pluginConfiguration: PluginConfiguration, paths: string[], projects: Record<string, ProjectConfiguration>, root: string): Promise<LoadedNxPlugin>;

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

@@ -1,12 +1,11 @@
 "use strict";
 // This file contains methods and utilities that should **only** be used by the plugin worker.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPluginPathAndName = exports.registerPluginTSTranspiler = exports.resolveLocalNxPlugin = exports.readPluginPackageJson = exports.loadNxPluginAsync = void 0;
+exports.loadNxPluginAsync = exports.loadPlugin = exports.loadPlugins = exports.getPluginPathAndName = exports.registerPluginTSTranspiler = exports.resolveLocalNxPlugin = exports.readPluginPackageJson = void 0;
 const posix_1 = require("node:path/posix");
 const installation_directory_1 = require("../../utils/installation-directory");
 const package_json_1 = require("../../utils/package-json");
 const fileutils_1 = require("../../utils/fileutils");
-const path = require("node:path/posix");
 const workspace_root_1 = require("../../utils/workspace-root");
 const node_fs_1 = require("node:fs");
 const typescript_1 = require("../../utils/typescript");
@@ -15,20 +14,9 @@ const find_project_for_path_1 = require("../utils/find-project-for-path");
 const path_1 = require("../../utils/path");
 const logger_1 = require("../../utils/logger");
 const node_path_1 = require("node:path");
+const path = require("node:path/posix");
+const retrieve_workspace_files_1 = require("../utils/retrieve-workspace-files");
 const utils_1 = require("./utils");
-async function loadNxPluginAsync(pluginConfiguration, paths, projects, root) {
-    const { plugin: moduleName, options } = typeof pluginConfiguration === 'object'
-        ? pluginConfiguration
-        : { plugin: pluginConfiguration, options: undefined };
-    performance.mark(`Load Nx Plugin: ${moduleName} - start`);
-    let { pluginPath, name } = await getPluginPathAndName(moduleName, paths, projects, root);
-    const plugin = (0, utils_1.normalizeNxPlugin)(await importPluginModule(pluginPath));
-    plugin.name ??= name;
-    performance.mark(`Load Nx Plugin: ${moduleName} - end`);
-    performance.measure(`Load Nx Plugin: ${moduleName}`, `Load Nx Plugin: ${moduleName} - start`, `Load Nx Plugin: ${moduleName} - end`);
-    return { plugin, options };
-}
-exports.loadNxPluginAsync = loadNxPluginAsync;
 function readPluginPackageJson(pluginName, projects, paths = (0, installation_directory_1.getNxRequirePaths)()) {
     try {
         const result = (0, package_json_1.readModulePackageJsonWithoutFallbacks)(pluginName, paths);
@@ -167,6 +155,36 @@ function getPluginPathAndName(moduleName, paths, projects, root) {
     return { pluginPath, name };
 }
 exports.getPluginPathAndName = getPluginPathAndName;
+let projectsWithoutInference;
+async function loadPlugins(plugins, root) {
+    return await Promise.all(plugins.map((p) => loadPlugin(p, root)));
+}
+exports.loadPlugins = loadPlugins;
+async function loadPlugin(plugin, root) {
+    try {
+        require.resolve(typeof plugin === 'string' ? plugin : plugin.plugin);
+    }
+    catch {
+        // If a plugin cannot be resolved, we will need projects to resolve it
+        projectsWithoutInference ??=
+            await (0, retrieve_workspace_files_1.retrieveProjectConfigurationsWithoutPluginInference)(root);
+    }
+    return await loadNxPluginAsync(plugin, (0, installation_directory_1.getNxRequirePaths)(root), projectsWithoutInference, root);
+}
+exports.loadPlugin = loadPlugin;
+async function loadNxPluginAsync(pluginConfiguration, paths, projects, root) {
+    const { plugin: moduleName, options } = typeof pluginConfiguration === 'object'
+        ? pluginConfiguration
+        : { plugin: pluginConfiguration, options: undefined };
+    performance.mark(`Load Nx Plugin: ${moduleName} - start`);
+    let { pluginPath, name } = await getPluginPathAndName(moduleName, paths, projects, root);
+    const plugin = (0, utils_1.normalizeNxPlugin)(await importPluginModule(pluginPath));
+    plugin.name ??= name;
+    performance.mark(`Load Nx Plugin: ${moduleName} - end`);
+    performance.measure(`Load Nx Plugin: ${moduleName}`, `Load Nx Plugin: ${moduleName} - start`, `Load Nx Plugin: ${moduleName} - end`);
+    return { plugin, options };
+}
+exports.loadNxPluginAsync = loadNxPluginAsync;
 async function importPluginModule(pluginPath) {
     const m = await Promise.resolve(`${pluginPath}`).then(s => require(s));
     if (m.default &&

package/src/project-graph/project-graph.js

@@ -12,6 +12,7 @@ const workspace_root_1 = require("../utils/workspace-root");
 const perf_hooks_1 = require("perf_hooks");
 const retrieve_workspace_files_1 = require("./utils/retrieve-workspace-files");
 const nx_json_1 = require("../config/nx-json");
+const internal_api_1 = require("./plugins/internal-api");
 /**
  * Synchronously reads the latest cached copy of the workspace's ProjectGraph.
  * @throws {Error} if there is no cached ProjectGraph to read from
@@ -67,18 +68,24 @@ exports.readProjectsConfigurationFromProjectGraph = readProjectsConfigurationFro
 async function buildProjectGraphAndSourceMapsWithoutDaemon() {
     global.NX_GRAPH_CREATION = true;
     const nxJson = (0, nx_json_1.readNxJson)();
-    perf_hooks_1.performance.mark('retrieve-project-configurations:start');
-    const { projects, externalNodes, sourceMaps, projectRootMap } = await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(workspace_root_1.workspaceRoot, nxJson);
-    perf_hooks_1.performance.mark('retrieve-project-configurations:end');
-    perf_hooks_1.performance.mark('retrieve-workspace-files:start');
-    const { allWorkspaceFiles, fileMap, rustReferences } = await (0, retrieve_workspace_files_1.retrieveWorkspaceFiles)(workspace_root_1.workspaceRoot, projectRootMap);
-    perf_hooks_1.performance.mark('retrieve-workspace-files:end');
-    const cacheEnabled = process.env.NX_CACHE_PROJECT_GRAPH !== 'false';
-    perf_hooks_1.performance.mark('build-project-graph-using-project-file-map:start');
-    const projectGraph = (await (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projects, externalNodes, fileMap, allWorkspaceFiles, rustReferences, cacheEnabled ? (0, nx_deps_cache_1.readFileMapCache)() : null, cacheEnabled)).projectGraph;
-    perf_hooks_1.performance.mark('build-project-graph-using-project-file-map:end');
-    delete global.NX_GRAPH_CREATION;
-    return { projectGraph, sourceMaps };
+    const [plugins, cleanup] = await (0, internal_api_1.loadNxPluginsInIsolation)(nxJson.plugins);
+    try {
+        perf_hooks_1.performance.mark('retrieve-project-configurations:start');
+        const { projects, externalNodes, sourceMaps, projectRootMap } = await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(plugins, workspace_root_1.workspaceRoot, nxJson);
+        perf_hooks_1.performance.mark('retrieve-project-configurations:end');
+        perf_hooks_1.performance.mark('retrieve-workspace-files:start');
+        const { allWorkspaceFiles, fileMap, rustReferences } = await (0, retrieve_workspace_files_1.retrieveWorkspaceFiles)(workspace_root_1.workspaceRoot, projectRootMap);
+        perf_hooks_1.performance.mark('retrieve-workspace-files:end');
+        const cacheEnabled = process.env.NX_CACHE_PROJECT_GRAPH !== 'false';
+        perf_hooks_1.performance.mark('build-project-graph-using-project-file-map:start');
+        const projectGraph = (await (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projects, externalNodes, fileMap, allWorkspaceFiles, rustReferences, cacheEnabled ? (0, nx_deps_cache_1.readFileMapCache)() : null, cacheEnabled, plugins)).projectGraph;
+        perf_hooks_1.performance.mark('build-project-graph-using-project-file-map:end');
+        delete global.NX_GRAPH_CREATION;
+        return { projectGraph, sourceMaps };
+    }
+    finally {
+        cleanup();
+    }
 }
 exports.buildProjectGraphAndSourceMapsWithoutDaemon = buildProjectGraphAndSourceMapsWithoutDaemon;
 function handleProjectGraphError(opts, e) {

package/src/project-graph/utils/project-configuration-utils.js

@@ -8,7 +8,6 @@ const target_defaults_plugin_1 = require("../../plugins/target-defaults/target-d
 const minimatch_1 = require("minimatch");
 const path_1 = require("path");
 const utils_1 = require("../plugins/utils");
-const plugin_pool_1 = require("../plugins/plugin-pool");
 function mergeProjectConfigurationIntoRootMap(projectRootMap, project, configurationSourceMaps, sourceInformation, 
 // This function is used when reading project configuration
 // in generators, where we don't want to do this.
@@ -149,9 +148,7 @@ plugins, root = workspace_root_1.workspaceRoot) {
         let r = createNodes(matchedFiles, {
             nxJsonConfiguration: nxJson,
             workspaceRoot: root,
-        }).catch((e) => (0, plugin_pool_1.shutdownPluginWorkers)().then(() => {
-            throw e;
-        }));
+        });
         results.push(r);
     }
     return Promise.all(results).then((results) => {

package/src/project-graph/utils/retrieve-workspace-files.d.ts

@@ -3,6 +3,7 @@ import { NxJsonConfiguration } from '../../config/nx-json';
 import { ProjectGraphExternalNode } from '../../config/project-graph';
 import { ConfigurationSourceMaps } from './project-configuration-utils';
 import { RemotePlugin } from '../plugins/internal-api';
+import { NxPlugin } from '../plugins';
 /**
  * Walks the workspace directory to create the `projectFileMap`, `ProjectConfigurations` and `allWorkspaceFiles`
  * @throws
@@ -19,11 +20,8 @@ export declare function retrieveWorkspaceFiles(workspaceRoot: string, projectRoo
 }>;
 /**
  * Walk through the workspace and return `ProjectConfigurations`. Only use this if the projectFileMap is not needed.
- *
- * @param workspaceRoot
- * @param nxJson
  */
-export declare function retrieveProjectConfigurations(workspaceRoot: string, nxJson: NxJsonConfiguration): Promise<RetrievedGraphNodes>;
+export declare function retrieveProjectConfigurations(plugins: RemotePlugin[], workspaceRoot: string, nxJson: NxJsonConfiguration): Promise<RetrievedGraphNodes>;
 export declare function retrieveProjectConfigurationsWithAngularProjects(workspaceRoot: string, nxJson: NxJsonConfiguration): Promise<RetrievedGraphNodes>;
 export type RetrievedGraphNodes = {
     externalNodes: Record<string, ProjectGraphExternalNode>;
@@ -31,11 +29,7 @@ export type RetrievedGraphNodes = {
     sourceMaps: ConfigurationSourceMaps;
     projectRootMap: Record<string, string>;
 };
-export declare function retrieveProjectConfigurationPaths(root: string, plugins: PluginGlobsOnly): string[];
+export declare function retrieveProjectConfigurationPaths(root: string, plugins: NxPlugin[]): string[];
 export declare function retrieveProjectConfigurationsWithoutPluginInference(root: string): Promise<Record<string, ProjectConfiguration>>;
 export declare function createProjectConfigurations(workspaceRoot: string, nxJson: NxJsonConfiguration, configFiles: string[], plugins: RemotePlugin[]): Promise<RetrievedGraphNodes>;
-type PluginGlobsOnly = Array<{
-    createNodes?: readonly [string, ...unknown[]];
-}>;
-export declare function configurationGlobs(plugins: PluginGlobsOnly): string[];
-export {};
+export declare function configurationGlobs(plugins: Array<NxPlugin>): string[];

package/src/project-graph/utils/retrieve-workspace-files.js

@@ -9,7 +9,6 @@ const internal_api_1 = require("../plugins/internal-api");
 const workspace_context_1 = require("../../utils/workspace-context");
 const build_all_workspace_files_1 = require("./build-all-workspace-files");
 const path_1 = require("path");
-const plugin_pool_1 = require("../plugins/plugin-pool");
 /**
  * Walks the workspace directory to create the `projectFileMap`, `ProjectConfigurations` and `allWorkspaceFiles`
  * @throws
@@ -36,16 +35,9 @@ async function retrieveWorkspaceFiles(workspaceRoot, projectRootMap) {
 exports.retrieveWorkspaceFiles = retrieveWorkspaceFiles;
 /**
  * Walk through the workspace and return `ProjectConfigurations`. Only use this if the projectFileMap is not needed.
- *
- * @param workspaceRoot
- * @param nxJson
  */
-async function retrieveProjectConfigurations(workspaceRoot, nxJson) {
-    const plugins = await (0, internal_api_1.loadNxPlugins)(nxJson?.plugins ?? [], workspaceRoot);
+async function retrieveProjectConfigurations(plugins, workspaceRoot, nxJson) {
     const projects = await _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins);
-    if (!global.NX_GRAPH_CREATION) {
-        await (0, plugin_pool_1.shutdownPluginWorkers)();
-    }
     return projects;
 }
 exports.retrieveProjectConfigurations = retrieveProjectConfigurations;
@@ -56,8 +48,10 @@ async function retrieveProjectConfigurationsWithAngularProjects(workspaceRoot, n
             (typeof p === 'object' && p.plugin === angular_json_1.NX_ANGULAR_JSON_PLUGIN_NAME))) {
         pluginsToLoad.push((0, path_1.join)(__dirname, '../../adapter/angular-json'));
     }
-    const plugins = await (0, internal_api_1.loadNxPlugins)(nxJson?.plugins ?? [], workspaceRoot);
-    return _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins);
+    const [plugins, cleanup] = await (0, internal_api_1.loadNxPluginsInIsolation)(nxJson?.plugins ?? [], workspaceRoot);
+    const res = _retrieveProjectConfigurations(workspaceRoot, nxJson, await plugins);
+    cleanup();
+    return res;
 }
 exports.retrieveProjectConfigurationsWithAngularProjects = retrieveProjectConfigurationsWithAngularProjects;
 function _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins) {
@@ -74,7 +68,7 @@ const projectsWithoutPluginCache = new Map();
 // TODO: This function is called way too often, it should be optimized without this cache
 async function retrieveProjectConfigurationsWithoutPluginInference(root) {
     const nxJson = (0, nx_json_1.readNxJson)(root);
-    const plugins = await (0, internal_api_1.loadNxPlugins)([]); // only load default plugins
+    const [plugins, cleanup] = await (0, internal_api_1.loadNxPluginsInIsolation)([]); // only load default plugins
     const projectGlobPatterns = retrieveProjectConfigurationPaths(root, plugins);
     const cacheKey = root + ',' + projectGlobPatterns.join(',');
     if (projectsWithoutPluginCache.has(cacheKey)) {
@@ -83,6 +77,7 @@ async function retrieveProjectConfigurationsWithoutPluginInference(root) {
     const projectFiles = (0, workspace_context_1.globWithWorkspaceContext)(root, projectGlobPatterns);
     const { projects } = await createProjectConfigurations(root, nxJson, projectFiles, plugins);
     projectsWithoutPluginCache.set(cacheKey, projects);
+    cleanup();
     return projects;
 }
 exports.retrieveProjectConfigurationsWithoutPluginInference = retrieveProjectConfigurationsWithoutPluginInference;
@@ -102,7 +97,7 @@ exports.createProjectConfigurations = createProjectConfigurations;
 function configurationGlobs(plugins) {
     const globPatterns = [];
     for (const plugin of plugins) {
-        if (plugin.createNodes) {
+        if ('createNodes' in plugin && plugin.createNodes) {
             globPatterns.push(plugin.createNodes[0]);
         }
     }

package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js

@@ -9,8 +9,9 @@ const output_1 = require("../../utils/output");
 const pretty_time_1 = require("./pretty-time");
 const formatting_utils_1 = require("./formatting-utils");
 const view_logs_utils_1 = require("./view-logs-utils");
-const LEFT_PAD = `  `;
-const EXTENDED_LEFT_PAD = `    `;
+const LEFT_PAD = `   `;
+const SPACER = `  `;
+const EXTENDED_LEFT_PAD = `      `;
 /**
  * The following function is responsible for creating a life cycle with dynamic
  * outputs, meaning previous outputs can be rewritten or modified as new outputs
@@ -92,7 +93,7 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
         switch (status) {
             case 'local-cache':
                 writeCompletedTaskResultLine(`${output_1.output.colors.green(figures.tick) +
-                    '  ' +
+                    SPACER +
                     output_1.output.formatCommand(task.id)}  ${output_1.output.dim('[local cache]')}`);
                 if (isVerbose) {
                     writeCommandOutputBlock(tasksToTerminalOutputs[task.id]);
@@ -100,7 +101,7 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
                 break;
             case 'local-cache-kept-existing':
                 writeCompletedTaskResultLine(`${output_1.output.colors.green(figures.tick) +
-                    '  ' +
+                    SPACER +
                     output_1.output.formatCommand(task.id)}  ${output_1.output.dim('[existing outputs match the cache, left as is]')}`);
                 if (isVerbose) {
                     writeCommandOutputBlock(tasksToTerminalOutputs[task.id]);
@@ -108,7 +109,7 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
                 break;
             case 'remote-cache':
                 writeCompletedTaskResultLine(`${output_1.output.colors.green(figures.tick) +
-                    '  ' +
+                    SPACER +
                     output_1.output.formatCommand(task.id)}  ${output_1.output.dim('[remote cache]')}`);
                 if (isVerbose) {
                     writeCommandOutputBlock(tasksToTerminalOutputs[task.id]);
@@ -117,7 +118,7 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
             case 'success': {
                 const timeTakenText = (0, pretty_time_1.prettyTime)(process.hrtime(tasksToProcessStartTimes[task.id]));
                 writeCompletedTaskResultLine(output_1.output.colors.green(figures.tick) +
-                    '  ' +
+                    SPACER +
                     output_1.output.formatCommand(task.id) +
                     output_1.output.dim(` (${timeTakenText})`));
                 if (isVerbose) {
@@ -126,9 +127,10 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
                 break;
             }
             case 'failure':
+                output_1.output.addNewline();
                 output_1.output.addNewline();
                 writeCompletedTaskResultLine(output_1.output.colors.red(figures.cross) +
-                    '  ' +
+                    SPACER +
                     output_1.output.formatCommand(output_1.output.colors.red(task.id)));
                 writeCommandOutputBlock(tasksToTerminalOutputs[task.id]);
                 break;
@@ -145,10 +147,10 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
         const runningTasks = taskRows.filter((row) => row.status === 'running');
         const remainingTasks = totalTasks - totalCompletedTasks;
         if (runningTasks.length > 0) {
-            additionalFooterRows.push(output_1.output.dim(`${LEFT_PAD}${output_1.output.colors.cyan(figures.arrowRight)}    Executing ${runningTasks.length}/${remainingTasks} remaining tasks${runningTasks.length > 1 ? ' in parallel' : ''}...`));
+            additionalFooterRows.push(output_1.output.dim(`${LEFT_PAD}${output_1.output.colors.cyan(figures.arrowRight)}${SPACER}Executing ${runningTasks.length}/${remainingTasks} remaining tasks${runningTasks.length > 1 ? ' in parallel' : ''}...`));
             additionalFooterRows.push('');
             for (const runningTask of runningTasks) {
-                additionalFooterRows.push(`${LEFT_PAD}${output_1.output.dim.cyan(cli_spinners_1.dots.frames[currentFrame])}    ${output_1.output.formatCommand(runningTask.task.id)}`);
+                additionalFooterRows.push(`${LEFT_PAD}${output_1.output.dim.cyan(cli_spinners_1.dots.frames[currentFrame])}${SPACER}${output_1.output.formatCommand(runningTask.task.id)}`);
             }
             /**
              * Reduce layout thrashing by ensuring that there is a relatively consistent
@@ -172,10 +174,10 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
             additionalFooterRows.push('');
         }
         if (totalSuccessfulTasks > 0) {
-            additionalFooterRows.push(`${LEFT_PAD}${output_1.output.colors.green(figures.tick)}    ${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`);
+            additionalFooterRows.push(`${LEFT_PAD}${output_1.output.colors.green(figures.tick)}${SPACER}${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`);
         }
         if (totalFailedTasks > 0) {
-            additionalFooterRows.push(`${LEFT_PAD}${output_1.output.colors.red(figures.cross)}    ${totalFailedTasks}${`/${totalCompletedTasks}`} failed`);
+            additionalFooterRows.push(`${LEFT_PAD}${output_1.output.colors.red(figures.cross)}${SPACER}${totalFailedTasks}${`/${totalCompletedTasks}`} failed`);
         }
         moveCursorToStartOfPinnedFooter();
         if (additionalFooterRows.length > 1) {
@@ -253,9 +255,10 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
                 output_1.output.applyNxPrefix('red', output_1.output.colors.red(text) + output_1.output.dim.white(` (${timeTakenText})`)),
                 ...taskOverridesRows,
                 '',
-                output_1.output.dim(`${LEFT_PAD}${output_1.output.dim(figures.tick)}    ${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`),
+                output_1.output.dim(`${LEFT_PAD}${output_1.output.dim(figures.tick)}${SPACER}${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`),
+                '',
+                `${LEFT_PAD}${output_1.output.colors.red(figures.cross)}${SPACER}${totalFailedTasks}${`/${totalCompletedTasks}`} targets failed, including the following:`,
                 '',
-                `${LEFT_PAD}${output_1.output.colors.red(figures.cross)}    ${totalFailedTasks}${`/${totalCompletedTasks}`} targets failed, including the following:`,
                 `${failedTasksForPrinting
                     .map((t) => `${EXTENDED_LEFT_PAD}${output_1.output.colors.red('-')} ${output_1.output.formatCommand(t.toString())}`)
                     .join('\n ')}`,

package/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.js

@@ -9,8 +9,9 @@ const output_1 = require("../../utils/output");
 const pretty_time_1 = require("./pretty-time");
 const formatting_utils_1 = require("./formatting-utils");
 const view_logs_utils_1 = require("./view-logs-utils");
-const LEFT_PAD = `  `;
-const EXTENDED_LEFT_PAD = `    `;
+const LEFT_PAD = `   `;
+const SPACER = `  `;
+const EXTENDED_LEFT_PAD = `      `;
 /**
  * The following function is responsible for creating a life cycle with dynamic
  * outputs, meaning previous outputs can be rewritten or modified as new outputs
@@ -88,7 +89,7 @@ async function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, arg
         switch (state) {
             case 'EXECUTING_DEPENDENT_TARGETS':
                 if (totalFailedTasks === 0) {
-                    linesToRender.push(`${LEFT_PAD}${output_1.output.colors.cyan(cli_spinners_1.dots.frames[dependentTargetsCurrentFrame])}    ${output_1.output.dim(`Nx is waiting on ${remainingDependentTasksNotFromInitiatingProject} dependent project tasks before running tasks from`)} ${initiatingProject}${output_1.output.dim('...')}`);
+                    linesToRender.push(`${LEFT_PAD}${output_1.output.colors.cyan(cli_spinners_1.dots.frames[dependentTargetsCurrentFrame])}${SPACER}${output_1.output.dim(`Nx is waiting on ${remainingDependentTasksNotFromInitiatingProject} dependent project tasks before running tasks from`)} ${initiatingProject}${output_1.output.dim('...')}`);
                     if (totalSuccessfulTasks > 0) {
                         linesToRender.push('');
                     }
@@ -96,10 +97,10 @@ async function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, arg
                 break;
         }
         if (totalFailedTasks > 0) {
-            linesToRender.push(output_1.output.colors.red.dim(`${LEFT_PAD}${output_1.output.colors.red(figures.cross)}    ${totalFailedTasks}${`/${totalCompletedTasks}`} dependent project tasks failed (see below)`));
+            linesToRender.push(output_1.output.colors.red.dim(`${LEFT_PAD}${output_1.output.colors.red(figures.cross)}${SPACER}${totalFailedTasks}${`/${totalCompletedTasks}`} dependent project tasks failed (see below)`));
         }
         if (totalSuccessfulTasks > 0) {
-            linesToRender.push(output_1.output.dim(`${LEFT_PAD}${output_1.output.dim(figures.tick)}    ${totalSuccessfulTasks}${`/${totalCompletedTasks}`} dependent project tasks succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`));
+            linesToRender.push(output_1.output.dim(`${LEFT_PAD}${output_1.output.dim(figures.tick)}${SPACER}${totalSuccessfulTasks}${`/${totalCompletedTasks}`} dependent project tasks succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`));
         }
         moveCursorToStartOfDependentTargetLines();
         if (linesToRender.length > 1) {
@@ -212,8 +213,8 @@ async function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, arg
                 output_1.output.applyNxPrefix('red', output_1.output.colors.red(text) + output_1.output.dim(` (${timeTakenText})`)),
                 ...taskOverridesLines,
                 '',
-                `${LEFT_PAD}${output_1.output.colors.red(figures.cross)}    ${totalFailedTasks}${`/${totalCompletedTasks}`} failed`,
-                `${LEFT_PAD}${output_1.output.dim(figures.tick)}    ${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`,
+                `${LEFT_PAD}${output_1.output.colors.red(figures.cross)}${SPACER}${totalFailedTasks}${`/${totalCompletedTasks}`} failed`,
+                `${LEFT_PAD}${output_1.output.dim(figures.tick)}${SPACER}${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`,
                 ...viewLogs,
             ], 'red');
         }

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

@@ -4,7 +4,7 @@ exports.listPluginCapabilities = exports.getPluginCapabilities = void 0;
 const chalk = require("chalk");
 const path_1 = require("path");
 const plugins_1 = require("../../project-graph/plugins");
-const plugin_pool_1 = require("../../project-graph/plugins/plugin-pool");
+const internal_api_1 = require("../../project-graph/plugins/internal-api");
 const fileutils_1 = require("../fileutils");
 const installation_directory_1 = require("../installation-directory");
 const output_1 = require("../output");
@@ -27,7 +27,7 @@ async function getPluginCapabilities(workspaceRoot, pluginName, projects, includ
     try {
         const { json: packageJson, path: packageJsonPath } = await (0, plugins_1.readPluginPackageJson)(pluginName, projects, (0, installation_directory_1.getNxRequirePaths)(workspaceRoot));
         const pluginModule = includeRuntimeCapabilities
-            ? await tryGetModule(packageJson, workspaceRoot, projects)
+            ? await tryGetModule(packageJson, workspaceRoot)
             : {};
         return {
             name: pluginName,
@@ -57,14 +57,14 @@ async function getPluginCapabilities(workspaceRoot, pluginName, projects, includ
     }
 }
 exports.getPluginCapabilities = getPluginCapabilities;
-async function tryGetModule(packageJson, workspaceRoot, projects) {
+async function tryGetModule(packageJson, workspaceRoot) {
     try {
         return (packageJson.generators ??
             packageJson.executors ??
             packageJson['nx-migrations'] ??
             packageJson['schematics'] ??
             packageJson['builders'])
-            ? await (0, plugin_pool_1.loadRemoteNxPlugin)(packageJson.name, workspaceRoot)
+            ? (await (0, internal_api_1.loadPlugin)(packageJson.name, workspaceRoot)).plugin
             : {
                 name: packageJson.name,
             };