nx 18.1.0-canary.20240309-235ca8c → 18.1.0-canary.20240313-81df848

package/src/plugins/target-defaults/target-defaults-plugin.d.ts

@@ -1,5 +1,5 @@
 import { TargetConfiguration } from '../../config/workspace-json-project-json';
-import { NxPluginV2 } from '../../project-graph/plugins';
+import { NxPluginV2 } from '../../utils/nx-plugin';
 /**
  * This marks that a target provides information which should modify a target already registered
  * on the project via other plugins. If the target has not already been registered, and this symbol is true,
@@ -18,7 +18,6 @@ export declare const ONLY_MODIFIES_EXISTING_TARGET = "NX_ONLY_MODIFIES_EXISTING_
  */
 export declare const OVERRIDE_SOURCE_FILE = "NX_OVERRIDE_SOURCE_FILE";
 export declare const TargetDefaultsPlugin: NxPluginV2;
-export default TargetDefaultsPlugin;
 /**
  * This fn gets target info that would make a target uniquely compatible
  * with what is described by project.json or package.json. As the merge process

package/src/plugins/target-defaults/target-defaults-plugin.js

@@ -87,7 +87,6 @@ exports.TargetDefaultsPlugin = {
         },
     ],
 };
-exports.default = exports.TargetDefaultsPlugin;
 function getExecutorToTargetMap(packageJsonTargets, projectJsonTargets) {
     const executorToTargetMap = new Map();
     const targets = Object.keys({

package/src/project-graph/affected/locators/project-glob-changes.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTouchedProjectsFromProjectGlobChanges = void 0;
 const minimatch_1 = require("minimatch");
 const workspace_root_1 = require("../../../utils/workspace-root");
+const installation_directory_1 = require("../../../utils/installation-directory");
 const path_1 = require("path");
 const fs_1 = require("fs");
 const retrieve_workspace_files_1 = require("../../utils/retrieve-workspace-files");
-const internal_api_1 = require("../../plugins/internal-api");
+const nx_plugin_1 = require("../../../utils/nx-plugin");
 const globs_1 = require("../../../utils/globs");
 const getTouchedProjectsFromProjectGlobChanges = async (touchedFiles, projectGraphNodes, nxJson) => {
-    const plugins = await (0, internal_api_1.loadPlugins)(nxJson?.plugins ?? [], workspace_root_1.workspaceRoot);
-    const globPattern = (0, globs_1.combineGlobPatterns)((0, retrieve_workspace_files_1.configurationGlobs)(plugins.map((p) => p.plugin)));
+    const globPattern = (0, globs_1.combineGlobPatterns)((0, retrieve_workspace_files_1.configurationGlobs)(await (0, nx_plugin_1.loadNxPlugins)(nxJson?.plugins, (0, installation_directory_1.getNxRequirePaths)(workspace_root_1.workspaceRoot), workspace_root_1.workspaceRoot)));
     const touchedProjects = new Set();
     for (const touchedFile of touchedFiles) {
         const isProjectFile = (0, minimatch_1.minimatch)(touchedFile.file, globPattern, {

package/src/project-graph/build-project-graph.d.ts

@@ -1,6 +1,5 @@
 import { FileData } from './file-utils';
 import { FileMapCache } from './nx-deps-cache';
-import { RemotePlugin } from './plugins/internal-api';
 import { FileMap, ProjectGraph, ProjectGraphExternalNode } from '../config/project-graph';
 import { ProjectConfiguration } from '../config/workspace-json-project-json';
 import { NxWorkspaceFilesExternals } from '../native';
@@ -9,7 +8,7 @@ export declare function getFileMap(): {
     allWorkspaceFiles: FileData[];
     rustReferences: NxWorkspaceFilesExternals | null;
 };
-export declare function buildProjectGraphUsingProjectFileMap(projects: Record<string, ProjectConfiguration>, externalNodes: Record<string, ProjectGraphExternalNode>, fileMap: FileMap, allWorkspaceFiles: FileData[], rustReferences: NxWorkspaceFilesExternals, fileMapCache: FileMapCache | null, shouldWriteCache: boolean, plugins: RemotePlugin[]): Promise<{
+export declare function buildProjectGraphUsingProjectFileMap(projects: Record<string, ProjectConfiguration>, externalNodes: Record<string, ProjectGraphExternalNode>, fileMap: FileMap, allWorkspaceFiles: FileData[], rustReferences: NxWorkspaceFilesExternals, fileMapCache: FileMapCache | null, shouldWriteCache: boolean): Promise<{
     projectGraph: ProjectGraph;
     projectFileMapCache: FileMapCache;
 }>;

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

@@ -8,12 +8,13 @@ const assert_workspace_validity_1 = require("../utils/assert-workspace-validity"
 const nx_deps_cache_1 = require("./nx-deps-cache");
 const implicit_project_dependencies_1 = require("./utils/implicit-project-dependencies");
 const normalize_project_nodes_1 = require("./utils/normalize-project-nodes");
-const utils_1 = require("./plugins/utils");
+const nx_plugin_1 = require("../utils/nx-plugin");
 const typescript_1 = require("../plugins/js/utils/typescript");
 const fileutils_1 = require("../utils/fileutils");
 const project_graph_builder_1 = require("./project-graph-builder");
 const configuration_1 = require("../config/configuration");
 const fs_1 = require("fs");
+const installation_directory_1 = require("../utils/installation-directory");
 const output_1 = require("../utils/output");
 let storedFileMap = null;
 let storedAllWorkspaceFiles = null;
@@ -38,7 +39,7 @@ function getFileMap() {
     }
 }
 exports.getFileMap = getFileMap;
-async function buildProjectGraphUsingProjectFileMap(projects, externalNodes, fileMap, allWorkspaceFiles, rustReferences, fileMapCache, shouldWriteCache, plugins) {
+async function buildProjectGraphUsingProjectFileMap(projects, externalNodes, fileMap, allWorkspaceFiles, rustReferences, fileMapCache, shouldWriteCache) {
     storedFileMap = fileMap;
     storedAllWorkspaceFiles = allWorkspaceFiles;
     storedRustReferences = rustReferences;
@@ -64,7 +65,7 @@ async function buildProjectGraphUsingProjectFileMap(projects, externalNodes, fil
         };
     }
     const context = createContext(projects, nxJson, externalNodes, fileMap, filesToProcess);
-    let projectGraph = await buildProjectGraphUsingContext(nxJson, externalNodes, context, cachedFileData, projectGraphVersion, plugins);
+    let projectGraph = await buildProjectGraphUsingContext(nxJson, externalNodes, context, cachedFileData, projectGraphVersion);
     const projectFileMapCache = (0, nx_deps_cache_1.createProjectFileMapCache)(nxJson, packageJsonDeps, fileMap, rootTsConfig);
     if (shouldWriteCache) {
         (0, nx_deps_cache_1.writeCache)(projectFileMapCache, projectGraph);
@@ -91,7 +92,7 @@ function readCombinedDeps() {
         ...installationPackageJson.devDependencies,
     };
 }
-async function buildProjectGraphUsingContext(nxJson, knownExternalNodes, ctx, cachedFileData, projectGraphVersion, plugins) {
+async function buildProjectGraphUsingContext(nxJson, knownExternalNodes, ctx, cachedFileData, projectGraphVersion) {
     perf_hooks_1.performance.mark('build project graph:start');
     const builder = new project_graph_builder_1.ProjectGraphBuilder(null, ctx.fileMap.projectFileMap);
     builder.setVersion(projectGraphVersion);
@@ -100,7 +101,7 @@ async function buildProjectGraphUsingContext(nxJson, knownExternalNodes, ctx, ca
     }
     await (0, normalize_project_nodes_1.normalizeProjectNodes)(ctx, builder);
     const initProjectGraph = builder.getUpdatedProjectGraph();
-    const r = await updateProjectGraphWithPlugins(ctx, initProjectGraph, plugins);
+    const r = await updateProjectGraphWithPlugins(ctx, initProjectGraph);
     const updatedBuilder = new project_graph_builder_1.ProjectGraphBuilder(r, ctx.fileMap.projectFileMap);
     for (const proj of Object.keys(cachedFileData.projectFileMap)) {
         for (const f of ctx.fileMap.projectFileMap[proj] || []) {
@@ -138,11 +139,12 @@ function createContext(projects, nxJson, externalNodes, fileMap, filesToProcess)
         filesToProcess,
     };
 }
-async function updateProjectGraphWithPlugins(context, initProjectGraph, plugins) {
+async function updateProjectGraphWithPlugins(context, initProjectGraph) {
+    const plugins = await (0, nx_plugin_1.loadNxPlugins)(context.nxJsonConfiguration?.plugins, (0, installation_directory_1.getNxRequirePaths)(), context.workspaceRoot, context.projects);
     let graph = initProjectGraph;
-    for (const plugin of plugins) {
+    for (const { plugin } of plugins) {
         try {
-            if ((0, utils_1.isNxPluginV1)(plugin) &&
+            if ((0, nx_plugin_1.isNxPluginV1)(plugin) &&
                 plugin.processProjectGraph &&
                 !plugin.createDependencies) {
                 output_1.output.warn({
@@ -180,12 +182,11 @@ async function updateProjectGraphWithPlugins(context, initProjectGraph, plugins)
         }
     }
     const builder = new project_graph_builder_1.ProjectGraphBuilder(graph, context.fileMap.projectFileMap, context.fileMap.nonProjectFiles);
-    const createDependencyPlugins = plugins.filter((plugin) => (0, utils_1.isNxPluginV2)(plugin) && plugin.createDependencies);
-    await Promise.all(createDependencyPlugins.map(async (plugin) => {
+    const createDependencyPlugins = plugins.filter(({ plugin }) => (0, nx_plugin_1.isNxPluginV2)(plugin) && plugin.createDependencies);
+    await Promise.all(createDependencyPlugins.map(async ({ plugin, options }) => {
         perf_hooks_1.performance.mark(`${plugin.name}:createDependencies - start`);
         try {
-            // TODO: we shouldn't have to pass null here
-            const dependencies = await plugin.createDependencies(null, {
+            const dependencies = await plugin.createDependencies(options, {
                 ...context,
             });
             for (const dep of dependencies) {

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

@@ -147,21 +147,21 @@ Object.defineProperty(exports, "workspaceLayout", { enumerable: true, get: funct
  * TODO(v19): Remove this function.
  */
 function getProjectsSyncNoInference(root, nxJson) {
-    const projectFiles = (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(root, (0, nx_plugin_deprecated_1.getDefaultPluginsSync)(root).map((p) => p.plugin));
+    const projectFiles = (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(root, (0, nx_plugin_deprecated_1.getDefaultPluginsSync)(root));
     const plugins = [
         { plugin: package_json_next_to_project_json_1.PackageJsonProjectsNextToProjectJsonPlugin },
         ...(0, nx_plugin_deprecated_1.getDefaultPluginsSync)(root),
     ];
     const projectRootMap = new Map();
     // We iterate over plugins first - this ensures that plugins specified first take precedence.
-    for (const { plugin } of plugins) {
+    for (const { plugin, options } of plugins) {
         const [pattern, createNodes] = plugin.createNodes ?? [];
         if (!pattern) {
             continue;
         }
         for (const file of projectFiles) {
             if ((0, minimatch_1.minimatch)(file, pattern, { dot: true })) {
-                let r = createNodes(file, {}, {
+                let r = createNodes(file, options, {
                     nxJsonConfiguration: nxJson,
                     workspaceRoot: root,
                 });

package/src/project-graph/project-graph-builder.d.ts

@@ -2,7 +2,7 @@
  * Builder for adding nodes and dependencies to a {@link ProjectGraph}
  */
 import { DependencyType, FileMap, ProjectFileMap, ProjectGraph, ProjectGraphExternalNode, ProjectGraphProjectNode } from '../config/project-graph';
-import { CreateDependenciesContext } from './plugins';
+import { CreateDependenciesContext } from '../utils/nx-plugin';
 /**
  * A class which builds up a project graph
  * @deprecated The {@link ProjectGraphProcessor} has been deprecated. Use a {@link CreateNodes} and/or a {@link CreateDependencies} instead. This will be removed in Nx 19.

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

@@ -12,7 +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");
+const nx_plugin_1 = require("../utils/nx-plugin");
 /**
  * Synchronously reads the latest cached copy of the workspace's ProjectGraph.
  * @throws {Error} if there is no cached ProjectGraph to read from
@@ -66,26 +66,22 @@ function readProjectsConfigurationFromProjectGraph(projectGraph) {
 }
 exports.readProjectsConfigurationFromProjectGraph = readProjectsConfigurationFromProjectGraph;
 async function buildProjectGraphAndSourceMapsWithoutDaemon() {
+    // Set this globally to allow plugins to know if they are being called from the project graph creation
     global.NX_GRAPH_CREATION = true;
     const nxJson = (0, nx_json_1.readNxJson)();
-    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();
-    }
+    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');
+    (0, nx_plugin_1.unregisterPluginTSTranspiler)();
+    delete global.NX_GRAPH_CREATION;
+    return { projectGraph, sourceMaps };
 }
 exports.buildProjectGraphAndSourceMapsWithoutDaemon = buildProjectGraphAndSourceMapsWithoutDaemon;
 function handleProjectGraphError(opts, e) {

package/src/project-graph/utils/normalize-project-nodes.d.ts

@@ -1,7 +1,7 @@
 import { ProjectGraphProjectNode } from '../../config/project-graph';
 import { ProjectGraphBuilder } from '../project-graph-builder';
 import { ProjectConfiguration, TargetConfiguration } from '../../config/workspace-json-project-json';
-import { CreateDependenciesContext } from '../plugins';
+import { CreateDependenciesContext } from '../../utils/nx-plugin';
 export declare function normalizeProjectNodes(ctx: CreateDependenciesContext, builder: ProjectGraphBuilder): Promise<void>;
 /**
  * Apply target defaults and normalization

package/src/project-graph/utils/project-configuration-utils.d.ts

@@ -1,8 +1,8 @@
 import { NxJsonConfiguration, TargetDefaults } from '../../config/nx-json';
 import { ProjectGraphExternalNode } from '../../config/project-graph';
 import { ProjectConfiguration, TargetConfiguration } from '../../config/workspace-json-project-json';
+import { LoadedNxPlugin } from '../../utils/nx-plugin';
 import { ONLY_MODIFIES_EXISTING_TARGET } from '../../plugins/target-defaults/target-defaults-plugin';
-import { RemotePlugin } from '../plugins/internal-api';
 export type SourceInformation = [file: string, plugin: string];
 export type ConfigurationSourceMaps = Record<string, Record<string, SourceInformation>>;
 export declare function mergeProjectConfigurationIntoRootMap(projectRootMap: Map<string, ProjectConfiguration>, project: ProjectConfiguration & {
@@ -25,7 +25,7 @@ export type ConfigurationResult = {
  * @param root The workspace root
  */
 export declare function buildProjectsConfigurationsFromProjectPathsAndPlugins(nxJson: NxJsonConfiguration, projectFiles: string[], // making this parameter allows devkit to pick up newly created projects
-plugins: RemotePlugin[], root?: string): Promise<ConfigurationResult>;
+plugins: LoadedNxPlugin[], root?: string): Promise<ConfigurationResult>;
 export declare function readProjectConfigurationsFromRootMap(projectRootMap: Map<string, ProjectConfiguration>): Record<string, ProjectConfiguration>;
 /**
  * Merges two targets.

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

@@ -7,7 +7,6 @@ const workspace_root_1 = require("../../utils/workspace-root");
 const target_defaults_plugin_1 = require("../../plugins/target-defaults/target-defaults-plugin");
 const minimatch_1 = require("minimatch");
 const path_1 = require("path");
-const utils_1 = require("../plugins/utils");
 function mergeProjectConfigurationIntoRootMap(projectRootMap, project, configurationSourceMaps, sourceInformation, 
 // This function is used when reading project configuration
 // in generators, where we don't want to do this.
@@ -133,23 +132,54 @@ function buildProjectsConfigurationsFromProjectPathsAndPlugins(nxJson, projectFi
 plugins, root = workspace_root_1.workspaceRoot) {
     const results = [];
     // We iterate over plugins first - this ensures that plugins specified first take precedence.
-    for (const plugin of plugins) {
+    for (const { plugin, options } of plugins) {
         const [pattern, createNodes] = plugin.createNodes ?? [];
+        const pluginResults = [];
+        performance.mark(`${plugin.name}:createNodes - start`);
         if (!pattern) {
             continue;
         }
-        const matchedFiles = [];
-        performance.mark(`${plugin.name}:createNodes - start`);
         for (const file of projectFiles) {
+            performance.mark(`${plugin.name}:createNodes:${file} - start`);
             if ((0, minimatch_1.minimatch)(file, pattern, { dot: true })) {
-                matchedFiles.push(file);
+                try {
+                    let r = createNodes(file, options, {
+                        nxJsonConfiguration: nxJson,
+                        workspaceRoot: root,
+                    });
+                    if (r instanceof Promise) {
+                        pluginResults.push(r
+                            .catch((e) => {
+                            performance.mark(`${plugin.name}:createNodes:${file} - end`);
+                            throw new CreateNodesError(`Unable to create nodes for ${file} using plugin ${plugin.name}.`, e);
+                        })
+                            .then((r) => {
+                            performance.mark(`${plugin.name}:createNodes:${file} - end`);
+                            performance.measure(`${plugin.name}:createNodes:${file}`, `${plugin.name}:createNodes:${file} - start`, `${plugin.name}:createNodes:${file} - end`);
+                            return { ...r, file, pluginName: plugin.name };
+                        }));
+                    }
+                    else {
+                        performance.mark(`${plugin.name}:createNodes:${file} - end`);
+                        performance.measure(`${plugin.name}:createNodes:${file}`, `${plugin.name}:createNodes:${file} - start`, `${plugin.name}:createNodes:${file} - end`);
+                        pluginResults.push({
+                            ...r,
+                            file,
+                            pluginName: plugin.name,
+                        });
+                    }
+                }
+                catch (e) {
+                    throw new CreateNodesError(`Unable to create nodes for ${file} using plugin ${plugin.name}.`, e);
+                }
             }
         }
-        let r = createNodes(matchedFiles, {
-            nxJsonConfiguration: nxJson,
-            workspaceRoot: root,
-        });
-        results.push(r);
+        // If there are no promises (counter undefined) or all promises have resolved (counter === 0)
+        results.push(Promise.all(pluginResults).then((results) => {
+            performance.mark(`${plugin.name}:createNodes - end`);
+            performance.measure(`${plugin.name}:createNodes`, `${plugin.name}:createNodes - start`, `${plugin.name}:createNodes - end`);
+            return results;
+        }));
     }
     return Promise.all(results).then((results) => {
         performance.mark('createNodes:merge - start');
@@ -171,7 +201,7 @@ plugins, root = workspace_root_1.workspaceRoot) {
                     mergeProjectConfigurationIntoRootMap(projectRootMap, project, configurationSourceMaps, sourceInfo);
                 }
                 catch (e) {
-                    throw new utils_1.CreateNodesError(`Unable to merge project information for "${project.root}" from ${result.file} using plugin ${result.pluginName}.`, e);
+                    throw new CreateNodesError(`Unable to merge project information for "${project.root}" from ${result.file} using plugin ${result.pluginName}.`, e);
                 }
             }
             Object.assign(externalNodes, pluginExternalNodes);
@@ -231,6 +261,20 @@ function readProjectConfigurationsFromRootMap(projectRootMap) {
     return projects;
 }
 exports.readProjectConfigurationsFromRootMap = readProjectConfigurationsFromRootMap;
+class CreateNodesError extends Error {
+    constructor(msg, cause) {
+        const message = `${msg} ${!cause
+            ? ''
+            : cause instanceof Error
+                ? `\n\n\t Inner Error: ${cause.stack}`
+                : cause}`;
+        // These errors are thrown during a JS callback which is invoked via rust.
+        // The errors messaging gets lost in the rust -> js -> rust transition, but
+        // logging the error here will ensure that it is visible in the console.
+        console.error(message);
+        super(message, { cause });
+    }
+}
 /**
  * Merges two targets.
  *

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

@@ -2,8 +2,7 @@ import { ProjectConfiguration } from '../../config/workspace-json-project-json';
 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';
+import { LoadedNxPlugin } from '../../utils/nx-plugin';
 /**
  * Walks the workspace directory to create the `projectFileMap`, `ProjectConfigurations` and `allWorkspaceFiles`
  * @throws
@@ -20,8 +19,11 @@ 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(plugins: RemotePlugin[], workspaceRoot: string, nxJson: NxJsonConfiguration): Promise<RetrievedGraphNodes>;
+export declare function retrieveProjectConfigurations(workspaceRoot: string, nxJson: NxJsonConfiguration): Promise<RetrievedGraphNodes>;
 export declare function retrieveProjectConfigurationsWithAngularProjects(workspaceRoot: string, nxJson: NxJsonConfiguration): Promise<RetrievedGraphNodes>;
 export type RetrievedGraphNodes = {
     externalNodes: Record<string, ProjectGraphExternalNode>;
@@ -29,7 +31,7 @@ export type RetrievedGraphNodes = {
     sourceMaps: ConfigurationSourceMaps;
     projectRootMap: Record<string, string>;
 };
-export declare function retrieveProjectConfigurationPaths(root: string, plugins: NxPlugin[]): string[];
+export declare function retrieveProjectConfigurationPaths(root: string, plugins: LoadedNxPlugin[]): 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>;
-export declare function configurationGlobs(plugins: Array<NxPlugin>): string[];
+export declare function createProjectConfigurations(workspaceRoot: string, nxJson: NxJsonConfiguration, configFiles: string[], plugins: LoadedNxPlugin[]): Promise<RetrievedGraphNodes>;
+export declare function configurationGlobs(plugins: LoadedNxPlugin[]): string[];

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

@@ -2,13 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configurationGlobs = exports.createProjectConfigurations = exports.retrieveProjectConfigurationsWithoutPluginInference = exports.retrieveProjectConfigurationPaths = exports.retrieveProjectConfigurationsWithAngularProjects = exports.retrieveProjectConfigurations = exports.retrieveWorkspaceFiles = void 0;
 const perf_hooks_1 = require("perf_hooks");
+const installation_directory_1 = require("../../utils/installation-directory");
 const angular_json_1 = require("../../adapter/angular-json");
 const nx_json_1 = require("../../config/nx-json");
+const package_json_workspaces_1 = require("../../plugins/package-json-workspaces");
 const project_configuration_utils_1 = require("./project-configuration-utils");
-const internal_api_1 = require("../plugins/internal-api");
+const nx_plugin_1 = require("../../utils/nx-plugin");
+const project_json_1 = require("../../plugins/project-json/build-nodes/project-json");
 const workspace_context_1 = require("../../utils/workspace-context");
 const build_all_workspace_files_1 = require("./build-all-workspace-files");
-const path_1 = require("path");
 /**
  * Walks the workspace directory to create the `projectFileMap`, `ProjectConfigurations` and `allWorkspaceFiles`
  * @throws
@@ -35,23 +37,22 @@ 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(plugins, workspaceRoot, nxJson) {
-    const projects = await _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins);
-    return projects;
+async function retrieveProjectConfigurations(workspaceRoot, nxJson) {
+    const plugins = await (0, nx_plugin_1.loadNxPlugins)(nxJson?.plugins ?? [], (0, installation_directory_1.getNxRequirePaths)(workspaceRoot), workspaceRoot);
+    return _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins);
 }
 exports.retrieveProjectConfigurations = retrieveProjectConfigurations;
 async function retrieveProjectConfigurationsWithAngularProjects(workspaceRoot, nxJson) {
-    const pluginsToLoad = nxJson?.plugins ?? [];
+    const plugins = await (0, nx_plugin_1.loadNxPlugins)(nxJson?.plugins ?? [], (0, installation_directory_1.getNxRequirePaths)(workspaceRoot), workspaceRoot);
     if ((0, angular_json_1.shouldMergeAngularProjects)(workspaceRoot, true) &&
-        !pluginsToLoad.some((p) => p === angular_json_1.NX_ANGULAR_JSON_PLUGIN_NAME ||
-            (typeof p === 'object' && p.plugin === angular_json_1.NX_ANGULAR_JSON_PLUGIN_NAME))) {
-        pluginsToLoad.push((0, path_1.join)(__dirname, '../../adapter/angular-json'));
+        !plugins.some((p) => p.plugin.name === angular_json_1.NX_ANGULAR_JSON_PLUGIN_NAME)) {
+        plugins.push({ plugin: angular_json_1.NxAngularJsonPlugin });
     }
-    const [plugins, cleanup] = await (0, internal_api_1.loadNxPluginsInIsolation)(nxJson?.plugins ?? [], workspaceRoot);
-    const res = _retrieveProjectConfigurations(workspaceRoot, nxJson, await plugins);
-    cleanup();
-    return res;
+    return _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins);
 }
 exports.retrieveProjectConfigurationsWithAngularProjects = retrieveProjectConfigurationsWithAngularProjects;
 function _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins) {
@@ -68,16 +69,18 @@ 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, cleanup] = await (0, internal_api_1.loadNxPluginsInIsolation)([]); // only load default plugins
+    const plugins = await (0, nx_plugin_1.getDefaultPlugins)(root);
     const projectGlobPatterns = retrieveProjectConfigurationPaths(root, plugins);
     const cacheKey = root + ',' + projectGlobPatterns.join(',');
     if (projectsWithoutPluginCache.has(cacheKey)) {
         return projectsWithoutPluginCache.get(cacheKey);
     }
     const projectFiles = (0, workspace_context_1.globWithWorkspaceContext)(root, projectGlobPatterns);
-    const { projects } = await createProjectConfigurations(root, nxJson, projectFiles, plugins);
+    const { projects } = await createProjectConfigurations(root, nxJson, projectFiles, [
+        { plugin: (0, package_json_workspaces_1.getNxPackageJsonWorkspacesPlugin)(root) },
+        { plugin: project_json_1.ProjectJsonProjectsPlugin },
+    ]);
     projectsWithoutPluginCache.set(cacheKey, projects);
-    cleanup();
     return projects;
 }
 exports.retrieveProjectConfigurationsWithoutPluginInference = retrieveProjectConfigurationsWithoutPluginInference;
@@ -96,8 +99,8 @@ async function createProjectConfigurations(workspaceRoot, nxJson, configFiles, p
 exports.createProjectConfigurations = createProjectConfigurations;
 function configurationGlobs(plugins) {
     const globPatterns = [];
-    for (const plugin of plugins) {
-        if ('createNodes' in plugin && plugin.createNodes) {
+    for (const { plugin } of plugins) {
+        if (plugin.createNodes) {
             globPatterns.push(plugin.createNodes[0]);
         }
     }

package/src/tasks-runner/task-orchestrator.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskOrchestrator = void 0;
 const events_1 = require("events");
 const perf_hooks_1 = require("perf_hooks");
+const path_1 = require("path");
+const run_commands_impl_1 = require("../executors/run-commands/run-commands.impl");
 const forked_process_task_runner_1 = require("./forked-process-task-runner");
 const cache_1 = require("./cache");
 const utils_1 = require("./utils");
@@ -10,6 +12,9 @@ const tasks_schedule_1 = require("./tasks-schedule");
 const hash_task_1 = require("../hasher/hash-task");
 const task_env_1 = require("./task-env");
 const os = require("os");
+const workspace_root_1 = require("../utils/workspace-root");
+const output_1 = require("../utils/output");
+const params_1 = require("../utils/params");
 class TaskOrchestrator {
     // endregion internal state
     constructor(hasher, initiatingProject, projectGraph, taskGraph, options, bail, daemon) {
@@ -205,13 +210,45 @@ class TaskOrchestrator {
         let results = doNotSkipCache ? await this.applyCachedResults([task]) : [];
         // the task wasn't cached
         if (results.length === 0) {
-            // cache prep
-            const { code, terminalOutput } = await this.runTaskInForkedProcess(task, env, pipeOutput, temporaryOutputPath, streamOutput);
-            results.push({
-                task,
-                status: code === 0 ? 'success' : 'failure',
-                terminalOutput,
-            });
+            const shouldPrefix = streamOutput && process.env.NX_PREFIX_OUTPUT === 'true';
+            const targetConfiguration = (0, utils_1.getTargetConfigurationForTask)(task, this.projectGraph);
+            if (process.env.NX_RUN_COMMANDS_DIRECTLY !== 'false' &&
+                targetConfiguration.executor === 'nx:run-commands' &&
+                !shouldPrefix) {
+                const { schema } = (0, utils_1.getExecutorForTask)(task, this.projectGraph);
+                const isRunOne = this.initiatingProject != null;
+                const combinedOptions = (0, params_1.combineOptionsForExecutor)(task.overrides, task.target.configuration ?? targetConfiguration.defaultConfiguration, targetConfiguration, schema, task.target.project, (0, path_1.relative)(task.projectRoot ?? workspace_root_1.workspaceRoot, process.cwd()), process.env.NX_VERBOSE_LOGGING === 'true');
+                if (streamOutput) {
+                    const args = (0, utils_1.getPrintableCommandArgsForTask)(task);
+                    output_1.output.logCommand(args.join(' '));
+                }
+                const { success, terminalOutput } = await (0, run_commands_impl_1.default)({
+                    ...combinedOptions,
+                    env,
+                    usePty: isRunOne && !this.tasksSchedule.hasTasks(),
+                    streamOutput,
+                }, {
+                    root: workspace_root_1.workspaceRoot, // only root is needed in runCommandsImpl
+                });
+                const status = success ? 'success' : 'failure';
+                if (!streamOutput) {
+                    this.options.lifeCycle.printTaskTerminalOutput(task, status, terminalOutput);
+                }
+                results.push({
+                    task,
+                    status,
+                    terminalOutput,
+                });
+            }
+            else {
+                // cache prep
+                const { code, terminalOutput } = await this.runTaskInForkedProcess(task, env, pipeOutput, temporaryOutputPath, streamOutput);
+                results.push({
+                    task,
+                    status: code === 0 ? 'success' : 'failure',
+                    terminalOutput,
+                });
+            }
         }
         await this.postRunSteps([task], results, doNotSkipCache, { groupId });
     }
@@ -338,7 +375,7 @@ class TaskOrchestrator {
             if (process.env.NX_NATIVE_COMMAND_RUNNER !== 'false') {
                 return true;
             }
-            const { schema } = await (0, utils_1.getExecutorForTask)(task, this.projectGraph);
+            const { schema } = (0, utils_1.getExecutorForTask)(task, this.projectGraph);
             return (schema.outputCapture === 'pipe' ||
                 process.env.NX_STREAM_OUTPUT === 'true');
         }

package/src/tasks-runner/tasks-schedule.js

@@ -89,7 +89,7 @@ class TasksSchedule {
         const batchMap = {};
         for (const root of this.notScheduledTaskGraph.roots) {
             const rootTask = this.notScheduledTaskGraph.tasks[root];
-            const executorName = await (0, utils_1.getExecutorNameForTask)(rootTask, this.projectGraph);
+            const executorName = (0, utils_1.getExecutorNameForTask)(rootTask, this.projectGraph);
             await this.processTaskForBatches(batchMap, rootTask, executorName, true);
         }
         for (const [executorName, taskGraph] of Object.entries(batchMap)) {
@@ -105,8 +105,8 @@ class TasksSchedule {
         if (!this.canBatchTaskBeScheduled(task.id, batches[rootExecutorName])) {
             return;
         }
-        const { batchImplementationFactory } = await (0, utils_1.getExecutorForTask)(task, this.projectGraph);
-        const executorName = await (0, utils_1.getExecutorNameForTask)(task, this.projectGraph);
+        const { batchImplementationFactory } = (0, utils_1.getExecutorForTask)(task, this.projectGraph);
+        const executorName = (0, utils_1.getExecutorNameForTask)(task, this.projectGraph);
         if (rootExecutorName !== executorName) {
             return;
         }

package/src/tasks-runner/utils.d.ts

@@ -1,7 +1,7 @@
 import { Task, TaskGraph } from '../config/task-graph';
 import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
-import { TargetDependencyConfig } from '../config/workspace-json-project-json';
-import { CustomHasher } from '../config/misc-interfaces';
+import { TargetConfiguration, TargetDependencyConfig } from '../config/workspace-json-project-json';
+import { CustomHasher, ExecutorConfig } from '../config/misc-interfaces';
 export declare function getCommandAsString(execCommand: string, task: Task): string;
 export declare function getDependencyConfigs({ project, target }: {
     project: string;
@@ -23,12 +23,13 @@ export declare function transformLegacyOutputs(projectRoot: string, error: Inval
 export declare function getOutputsForTargetAndConfiguration(task: Task, node: ProjectGraphProjectNode): string[];
 export declare function getOutputsForTargetAndConfiguration(target: Task['target'] | Task, overrides: Task['overrides'] | ProjectGraphProjectNode, node: ProjectGraphProjectNode): string[];
 export declare function interpolate(template: string, data: any): string;
-export declare function getExecutorNameForTask(task: Task, projectGraph: ProjectGraph): Promise<string>;
-export declare function getExecutorForTask(task: Task, projectGraph: ProjectGraph): Promise<import("../config/misc-interfaces").ExecutorConfig & {
+export declare function getTargetConfigurationForTask(task: Task, projectGraph: ProjectGraph): TargetConfiguration | undefined;
+export declare function getExecutorNameForTask(task: Task, projectGraph: ProjectGraph): string;
+export declare function getExecutorForTask(task: Task, projectGraph: ProjectGraph): ExecutorConfig & {
     isNgCompat: boolean;
     isNxExecutor: boolean;
-}>;
-export declare function getCustomHasher(task: Task, projectGraph: ProjectGraph): Promise<CustomHasher> | null;
+};
+export declare function getCustomHasher(task: Task, projectGraph: ProjectGraph): CustomHasher | null;
 export declare function removeTasksFromTaskGraph(graph: TaskGraph, ids: string[]): TaskGraph;
 export declare function removeIdsFromGraph<T>(graph: {
     roots: string[];