nx 18.2.4 → 18.3.0-beta.1

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

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readTargetDefaultsForTarget = exports.resolveNxTokensInOptions = exports.isCompatibleTarget = exports.mergeTargetConfigurations = exports.MergeNodesError = exports.CreateNodesError = exports.ProjectConfigurationsError = exports.readProjectConfigurationsFromRootMap = exports.createProjectConfigurations = exports.mergeProjectConfigurationIntoRootMap = void 0;
+exports.readTargetDefaultsForTarget = exports.resolveNxTokensInOptions = exports.isCompatibleTarget = exports.mergeTargetConfigurations = exports.readProjectConfigurationsFromRootMap = exports.createProjectConfigurations = exports.mergeProjectConfigurationIntoRootMap = void 0;
 const logger_1 = require("../../utils/logger");
 const fileutils_1 = require("../../utils/fileutils");
 const workspace_root_1 = require("../../utils/workspace-root");
-const target_defaults_plugin_1 = require("../../plugins/target-defaults/target-defaults-plugin");
+const symbols_1 = require("../../plugins/target-defaults/symbols");
 const minimatch_1 = require("minimatch");
 const path_1 = require("path");
 const perf_hooks_1 = require("perf_hooks");
+const error_types_1 = require("../error-types");
 function mergeProjectConfigurationIntoRootMap(projectRootMap, project, configurationSourceMaps, sourceInformation, 
 // This function is used when reading project configuration
 // in generators, where we don't want to do this.
@@ -104,6 +105,9 @@ skipCommandNormalization) {
             }
         }
     }
+    if (project.metadata) {
+        updatedProjectConfiguration.metadata = mergeMetadata(sourceMap, sourceInformation, 'metadata', project.metadata, matchingProject.metadata);
+    }
     if (project.targets) {
         // We merge the targets with special handling, so clear this back to the
         // targets as defined originally before merging.
@@ -116,12 +120,12 @@ skipCommandNormalization) {
             // Always set source map info for the target, but don't overwrite info already there
             // if augmenting an existing target.
             const target = project.targets?.[targetName];
-            if (sourceMap && !target?.[target_defaults_plugin_1.ONLY_MODIFIES_EXISTING_TARGET]) {
+            if (sourceMap && !target?.[symbols_1.ONLY_MODIFIES_EXISTING_TARGET]) {
                 sourceMap[`targets.${targetName}`] = sourceInformation;
             }
             // If ONLY_MODIFIES_EXISTING_TARGET is true, and its not on the matching project
             // we shouldn't merge its info into the graph
-            if (target?.[target_defaults_plugin_1.ONLY_MODIFIES_EXISTING_TARGET] &&
+            if (target?.[symbols_1.ONLY_MODIFIES_EXISTING_TARGET] &&
                 !matchingProject.targets?.[targetName]) {
                 continue;
             }
@@ -129,73 +133,74 @@ skipCommandNormalization) {
                 ? target
                 : resolveCommandSyntacticSugar(target, project.root), matchingProject.targets?.[targetName], sourceMap, sourceInformation, `targets.${targetName}`);
             // We don't want the symbol to live on past the merge process
-            if (mergedTarget?.[target_defaults_plugin_1.ONLY_MODIFIES_EXISTING_TARGET])
-                delete mergedTarget?.[target_defaults_plugin_1.ONLY_MODIFIES_EXISTING_TARGET];
+            if (mergedTarget?.[symbols_1.ONLY_MODIFIES_EXISTING_TARGET])
+                delete mergedTarget?.[symbols_1.ONLY_MODIFIES_EXISTING_TARGET];
             updatedProjectConfiguration.targets[targetName] = mergedTarget;
         }
     }
-    if (project.metadata) {
-        if (sourceMap) {
-            sourceMap['targets'] ??= sourceInformation;
-        }
-        for (const [metadataKey, value] of Object.entries({
-            ...project.metadata,
-        })) {
-            const existingValue = matchingProject.metadata?.[metadataKey];
-            if (Array.isArray(value) && Array.isArray(existingValue)) {
-                for (const item of [...value]) {
-                    const newLength = updatedProjectConfiguration.metadata[metadataKey].push(item);
-                    if (sourceMap) {
-                        sourceMap[`metadata.${metadataKey}.${newLength - 1}`] =
-                            sourceInformation;
-                    }
+    projectRootMap.set(updatedProjectConfiguration.root, updatedProjectConfiguration);
+}
+exports.mergeProjectConfigurationIntoRootMap = mergeProjectConfigurationIntoRootMap;
+function mergeMetadata(sourceMap, sourceInformation, baseSourceMapPath, metadata, matchingMetadata) {
+    const result = {
+        ...(matchingMetadata ?? {}),
+    };
+    for (const [metadataKey, value] of Object.entries(metadata)) {
+        const existingValue = matchingMetadata?.[metadataKey];
+        if (Array.isArray(value) && Array.isArray(existingValue)) {
+            for (const item of [...value]) {
+                const newLength = result[metadataKey].push(item);
+                if (sourceMap) {
+                    sourceMap[`${baseSourceMapPath}.${metadataKey}.${newLength - 1}`] =
+                        sourceInformation;
                 }
             }
-            else if (Array.isArray(value) && existingValue === undefined) {
-                updatedProjectConfiguration.metadata ??= {};
-                updatedProjectConfiguration.metadata[metadataKey] ??= value;
+        }
+        else if (Array.isArray(value) && existingValue === undefined) {
+            result[metadataKey] ??= value;
+            if (sourceMap) {
+                sourceMap[`${baseSourceMapPath}.${metadataKey}`] = sourceInformation;
+            }
+            for (let i = 0; i < value.length; i++) {
                 if (sourceMap) {
-                    sourceMap[`metadata.${metadataKey}`] = sourceInformation;
-                }
-                for (let i = 0; i < value.length; i++) {
-                    if (sourceMap) {
-                        sourceMap[`metadata.${metadataKey}.${i}`] = sourceInformation;
-                    }
+                    sourceMap[`${baseSourceMapPath}.${metadataKey}.${i}`] =
+                        sourceInformation;
                 }
             }
-            else if (typeof value === 'object' &&
-                typeof existingValue === 'object') {
-                for (const key in value) {
-                    const existingValue = matchingProject.metadata?.[metadataKey]?.[key];
-                    if (Array.isArray(value[key]) && Array.isArray(existingValue)) {
-                        for (const item of value[key]) {
-                            const i = updatedProjectConfiguration.metadata[metadataKey][key].push(item);
-                            if (sourceMap) {
-                                sourceMap[`metadata.${metadataKey}.${key}.${i - 1}`] =
-                                    sourceInformation;
-                            }
-                        }
-                    }
-                    else {
-                        updatedProjectConfiguration.metadata[metadataKey] = value;
+        }
+        else if (typeof value === 'object' && typeof existingValue === 'object') {
+            for (const key in value) {
+                const existingValue = matchingMetadata?.[metadataKey]?.[key];
+                if (Array.isArray(value[key]) && Array.isArray(existingValue)) {
+                    for (const item of value[key]) {
+                        const i = result[metadataKey][key].push(item);
                         if (sourceMap) {
-                            sourceMap[`metadata.${metadataKey}`] = sourceInformation;
+                            sourceMap[`${baseSourceMapPath}.${metadataKey}.${key}.${i - 1}`] =
+                                sourceInformation;
                         }
                     }
                 }
+                else {
+                    result[metadataKey] = value;
+                    if (sourceMap) {
+                        sourceMap[`${baseSourceMapPath}.${metadataKey}`] =
+                            sourceInformation;
+                    }
+                }
             }
-            else {
-                updatedProjectConfiguration.metadata[metadataKey] = value;
-                if (sourceMap) {
-                    sourceMap[`metadata.${metadataKey}`] = sourceInformation;
-                    if (typeof value === 'object') {
-                        for (const k in value) {
-                            sourceMap[`metadata.${metadataKey}.${k}`] = sourceInformation;
-                            if (Array.isArray(value[k])) {
-                                for (let i = 0; i < value[k].length; i++) {
-                                    sourceMap[`metadata.${metadataKey}.${k}.${i}`] =
-                                        sourceInformation;
-                                }
+        }
+        else {
+            result[metadataKey] = value;
+            if (sourceMap) {
+                sourceMap[`${baseSourceMapPath}.${metadataKey}`] = sourceInformation;
+                if (typeof value === 'object') {
+                    for (const k in value) {
+                        sourceMap[`${baseSourceMapPath}.${metadataKey}.${k}`] =
+                            sourceInformation;
+                        if (Array.isArray(value[k])) {
+                            for (let i = 0; i < value[k].length; i++) {
+                                sourceMap[`${baseSourceMapPath}.${metadataKey}.${k}.${i}`] =
+                                    sourceInformation;
                             }
                         }
                     }
@@ -203,9 +208,8 @@ skipCommandNormalization) {
             }
         }
     }
-    projectRootMap.set(updatedProjectConfiguration.root, updatedProjectConfiguration);
+    return result;
 }
-exports.mergeProjectConfigurationIntoRootMap = mergeProjectConfigurationIntoRootMap;
 /**
  * Transforms a list of project paths into a map of project configurations.
  *
@@ -214,21 +218,19 @@ exports.mergeProjectConfigurationIntoRootMap = mergeProjectConfigurationIntoRoot
  * @param workspaceFiles A list of non-ignored workspace files
  * @param plugins The plugins that should be used to infer project configuration
  */
-function createProjectConfigurations(root = workspace_root_1.workspaceRoot, nxJson, workspaceFiles, // making this parameter allows devkit to pick up newly created projects
+async function createProjectConfigurations(root = workspace_root_1.workspaceRoot, nxJson, projectFiles, // making this parameter allows devkit to pick up newly created projects
 plugins) {
     perf_hooks_1.performance.mark('build-project-configs:start');
     const results = [];
     const errors = [];
     // We iterate over plugins first - this ensures that plugins specified first take precedence.
-    for (const { plugin, options, include, exclude } of plugins) {
-        const [pattern, createNodes] = plugin.createNodes ?? [];
-        const pluginResults = [];
-        perf_hooks_1.performance.mark(`${plugin.name}:createNodes - start`);
+    for (const { name: pluginName, createNodes: createNodesTuple, include, exclude, } of plugins) {
+        const [pattern, createNodes] = createNodesTuple ?? [];
         if (!pattern) {
             continue;
         }
         const matchingConfigFiles = [];
-        for (const file of workspaceFiles) {
+        for (const file of projectFiles) {
             if ((0, minimatch_1.minimatch)(file, pattern, { dot: true })) {
                 if (include) {
                     const included = include.some((includedPattern) => (0, minimatch_1.minimatch)(file, includedPattern, { dot: true }));
@@ -237,7 +239,7 @@ plugins) {
                     }
                 }
                 if (exclude) {
-                    const excluded = include.some((excludedPattern) => (0, minimatch_1.minimatch)(file, excludedPattern, { dot: true }));
+                    const excluded = exclude.some((excludedPattern) => (0, minimatch_1.minimatch)(file, excludedPattern, { dot: true }));
                     if (excluded) {
                         continue;
                     }
@@ -245,56 +247,20 @@ plugins) {
                 matchingConfigFiles.push(file);
             }
         }
-        for (const file of matchingConfigFiles) {
-            perf_hooks_1.performance.mark(`${plugin.name}:createNodes:${file} - start`);
-            try {
-                let r = createNodes(file, options, {
-                    nxJsonConfiguration: nxJson,
-                    workspaceRoot: root,
-                    configFiles: matchingConfigFiles,
-                });
-                if (r instanceof Promise) {
-                    pluginResults.push(r
-                        .catch((error) => {
-                        perf_hooks_1.performance.mark(`${plugin.name}:createNodes:${file} - end`);
-                        errors.push(new CreateNodesError({
-                            file,
-                            pluginName: plugin.name,
-                            error,
-                        }));
-                        return {
-                            projects: {},
-                        };
-                    })
-                        .then((r) => {
-                        perf_hooks_1.performance.mark(`${plugin.name}:createNodes:${file} - end`);
-                        perf_hooks_1.performance.measure(`${plugin.name}:createNodes:${file}`, `${plugin.name}:createNodes:${file} - start`, `${plugin.name}:createNodes:${file} - end`);
-                        return { ...r, file, pluginName: plugin.name };
-                    }));
-                }
-                else {
-                    perf_hooks_1.performance.mark(`${plugin.name}:createNodes:${file} - end`);
-                    perf_hooks_1.performance.measure(`${plugin.name}:createNodes:${file}`, `${plugin.name}:createNodes:${file} - start`, `${plugin.name}:createNodes:${file} - end`);
-                    pluginResults.push({
-                        ...r,
-                        file,
-                        pluginName: plugin.name,
-                    });
-                }
+        let r = createNodes(matchingConfigFiles, {
+            nxJsonConfiguration: nxJson,
+            workspaceRoot: root,
+            configFiles: matchingConfigFiles,
+        }).catch((e) => {
+            if ((0, error_types_1.isAggregateCreateNodesError)(e)) {
+                errors.push(...e.errors);
+                return e.partialResults;
             }
-            catch (error) {
-                errors.push(new CreateNodesError({
-                    file,
-                    pluginName: plugin.name,
-                    error,
-                }));
+            else {
+                throw e;
             }
-        }
-        results.push(Promise.all(pluginResults).then((results) => {
-            perf_hooks_1.performance.mark(`${plugin.name}:createNodes - end`);
-            perf_hooks_1.performance.measure(`${plugin.name}:createNodes`, `${plugin.name}:createNodes - start`, `${plugin.name}:createNodes - end`);
-            return results;
-        }));
+        });
+        results.push(r);
     }
     return Promise.all(results).then((results) => {
         perf_hooks_1.performance.mark('createNodes:merge - start');
@@ -304,8 +270,8 @@ plugins) {
         for (const result of results.flat()) {
             const { projects: projectNodes, externalNodes: pluginExternalNodes, file, pluginName, } = result;
             const sourceInfo = [file, pluginName];
-            if (result[target_defaults_plugin_1.OVERRIDE_SOURCE_FILE]) {
-                sourceInfo[0] = result[target_defaults_plugin_1.OVERRIDE_SOURCE_FILE];
+            if (result[symbols_1.OVERRIDE_SOURCE_FILE]) {
+                sourceInfo[0] = result[symbols_1.OVERRIDE_SOURCE_FILE];
             }
             for (const node in projectNodes) {
                 const project = {
@@ -316,7 +282,7 @@ plugins) {
                     mergeProjectConfigurationIntoRootMap(projectRootMap, project, configurationSourceMaps, sourceInfo);
                 }
                 catch (error) {
-                    errors.push(new MergeNodesError({
+                    errors.push(new error_types_1.MergeNodesError({
                         file,
                         pluginName,
                         error,
@@ -340,7 +306,7 @@ plugins) {
             };
         }
         else {
-            throw new ProjectConfigurationsError(errors, {
+            throw new error_types_1.ProjectConfigurationsError(errors, {
                 projects,
                 externalNodes,
                 projectRootMap: rootMap,
@@ -392,37 +358,6 @@ function readProjectConfigurationsFromRootMap(projectRootMap) {
     return projects;
 }
 exports.readProjectConfigurationsFromRootMap = readProjectConfigurationsFromRootMap;
-class ProjectConfigurationsError extends Error {
-    constructor(errors, partialProjectConfigurationsResult) {
-        super('Failed to create project configurations');
-        this.errors = errors;
-        this.partialProjectConfigurationsResult = partialProjectConfigurationsResult;
-        this.name = this.constructor.name;
-    }
-}
-exports.ProjectConfigurationsError = ProjectConfigurationsError;
-class CreateNodesError extends Error {
-    constructor({ file, pluginName, error, }) {
-        const msg = `The "${pluginName}" plugin threw an error while creating nodes from ${file}:`;
-        super(msg, { cause: error });
-        this.name = this.constructor.name;
-        this.file = file;
-        this.pluginName = pluginName;
-        this.stack = `${this.message}\n  ${error.stack.split('\n').join('\n  ')}`;
-    }
-}
-exports.CreateNodesError = CreateNodesError;
-class MergeNodesError extends Error {
-    constructor({ file, pluginName, error, }) {
-        const msg = `The nodes created from ${file} by the "${pluginName}" could not be merged into the project graph:`;
-        super(msg, { cause: error });
-        this.name = this.constructor.name;
-        this.file = file;
-        this.pluginName = pluginName;
-        this.stack = `${this.message}\n  ${error.stack.split('\n').join('\n  ')}`;
-    }
-}
-exports.MergeNodesError = MergeNodesError;
 /**
  * Merges two targets.
  *
@@ -445,7 +380,7 @@ function mergeTargetConfigurations(target, baseTarget, projectConfigSourceMap, s
     // with the new one. However, we have a special case for targets that have the
     // ONLY_MODIFIES_EXISTING_TARGET symbol set. This prevents the merged target
     // equaling info that should have only been used to modify the existing target.
-    if (!isCompatible && target[target_defaults_plugin_1.ONLY_MODIFIES_EXISTING_TARGET]) {
+    if (!isCompatible && target[symbols_1.ONLY_MODIFIES_EXISTING_TARGET]) {
         return baseTarget;
     }
     if (!isCompatible && projectConfigSourceMap) {
@@ -481,6 +416,9 @@ function mergeTargetConfigurations(target, baseTarget, projectConfigSourceMap, s
     if (target.configurations || defaultConfigurations) {
         result.configurations = mergeConfigurations(target.configurations, isCompatible ? defaultConfigurations : undefined, projectConfigSourceMap, sourceInformation, targetIdentifier);
     }
+    if (target.metadata) {
+        result.metadata = mergeMetadata(projectConfigSourceMap, sourceInformation, `${targetIdentifier}.metadata`, target.metadata, baseTarget?.metadata);
+    }
     return result;
 }
 exports.mergeTargetConfigurations = mergeTargetConfigurations;

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

@@ -1,7 +1,7 @@
 import { ProjectConfiguration } from '../../config/workspace-json-project-json';
 import { NxJsonConfiguration } from '../../config/nx-json';
 import { ConfigurationResult } from './project-configuration-utils';
-import { LoadedNxPlugin } from '../../utils/nx-plugin';
+import { LoadedNxPlugin } from '../plugins/internal-api';
 /**
  * Walks the workspace directory to create the `projectFileMap`, `ProjectConfigurations` and `allWorkspaceFiles`
  * @throws
@@ -9,21 +9,22 @@ import { LoadedNxPlugin } from '../../utils/nx-plugin';
  * @param nxJson
  */
 export declare function retrieveWorkspaceFiles(workspaceRoot: string, projectRootMap: Record<string, string>): Promise<{
-    allWorkspaceFiles: import("nx/src/devkit-exports").FileData[];
+    allWorkspaceFiles: import("../file-utils").FileData[];
     fileMap: {
         projectFileMap: ProjectFiles;
-        nonProjectFiles: import("nx/src/native").FileData[];
+        nonProjectFiles: import("../../native").FileData[];
     };
-    rustReferences: import("nx/src/native").NxWorkspaceFilesExternals;
+    rustReferences: import("../../native").NxWorkspaceFilesExternals;
 }>;
 /**
  * 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<ConfigurationResult>;
+export declare function retrieveProjectConfigurations(plugins: LoadedNxPlugin[], workspaceRoot: string, nxJson: NxJsonConfiguration): Promise<ConfigurationResult>;
 export declare function retrieveProjectConfigurationsWithAngularProjects(workspaceRoot: string, nxJson: NxJsonConfiguration): Promise<ConfigurationResult>;
-export declare function retrieveProjectConfigurationPaths(root: string, plugins: LoadedNxPlugin[]): string[];
+export declare function retrieveProjectConfigurationPaths(root: string, plugins: Array<{
+    createNodes?: readonly [string, ...unknown[]];
+} & unknown>): string[];
 export declare function retrieveProjectConfigurationsWithoutPluginInference(root: string): Promise<Record<string, ProjectConfiguration>>;
-export declare function configurationGlobs(plugins: LoadedNxPlugin[]): string[];
+export declare function configurationGlobs(plugins: Array<{
+    createNodes?: readonly [string, ...unknown[]];
+}>): string[];

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

@@ -2,15 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configurationGlobs = 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 nx_plugin_1 = require("../../utils/nx-plugin");
-const project_json_1 = require("../../plugins/project-json/build-nodes/project-json");
+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");
 /**
  * Walks the workspace directory to create the `projectFileMap`, `ProjectConfigurations` and `allWorkspaceFiles`
  * @throws
@@ -37,22 +35,23 @@ 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, nx_plugin_1.loadNxPlugins)(nxJson?.plugins ?? [], (0, installation_directory_1.getNxRequirePaths)(workspaceRoot), workspaceRoot);
-    return _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins);
+async function retrieveProjectConfigurations(plugins, workspaceRoot, nxJson) {
+    const projects = await _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins);
+    return projects;
 }
 exports.retrieveProjectConfigurations = retrieveProjectConfigurations;
 async function retrieveProjectConfigurationsWithAngularProjects(workspaceRoot, nxJson) {
-    const plugins = await (0, nx_plugin_1.loadNxPlugins)(nxJson?.plugins ?? [], (0, installation_directory_1.getNxRequirePaths)(workspaceRoot), workspaceRoot);
+    const pluginsToLoad = nxJson?.plugins ?? [];
     if ((0, angular_json_1.shouldMergeAngularProjects)(workspaceRoot, true) &&
-        !plugins.some((p) => p.plugin.name === angular_json_1.NX_ANGULAR_JSON_PLUGIN_NAME)) {
-        plugins.push({ plugin: angular_json_1.NxAngularJsonPlugin });
+        !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'));
     }
-    return _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins);
+    const [plugins, cleanup] = await (0, internal_api_1.loadNxPlugins)(nxJson?.plugins ?? [], workspaceRoot);
+    const res = _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins);
+    cleanup();
+    return res;
 }
 exports.retrieveProjectConfigurationsWithAngularProjects = retrieveProjectConfigurationsWithAngularProjects;
 function _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins) {
@@ -69,25 +68,23 @@ 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, nx_plugin_1.getDefaultPlugins)(root);
+    const [plugins, cleanup] = await (0, internal_api_1.loadNxPlugins)([]); // only load default plugins
     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 (0, project_configuration_utils_1.createProjectConfigurations)(root, nxJson, projectFiles, [
-        { plugin: (0, package_json_workspaces_1.getNxPackageJsonWorkspacesPlugin)(root) },
-        { plugin: project_json_1.ProjectJsonProjectsPlugin },
-    ]);
+    const { projects } = await (0, project_configuration_utils_1.createProjectConfigurations)(root, nxJson, projectFiles, plugins);
     projectsWithoutPluginCache.set(cacheKey, projects);
+    cleanup();
     return projects;
 }
 exports.retrieveProjectConfigurationsWithoutPluginInference = retrieveProjectConfigurationsWithoutPluginInference;
 function configurationGlobs(plugins) {
     const globPatterns = [];
-    for (const { plugin } of plugins) {
-        if (plugin.createNodes) {
+    for (const plugin of plugins) {
+        if ('createNodes' in plugin && plugin.createNodes) {
             globPatterns.push(plugin.createNodes[0]);
         }
     }

package/src/tasks-runner/cache.js

@@ -197,7 +197,7 @@ class Cache {
                     `The local cache artifact in "${td}" was not generated on this machine.`,
                     `As a result, the cache's content integrity cannot be confirmed, which may make cache restoration potentially unsafe.`,
                     `If your machine ID has changed since the artifact was cached, run "nx reset" to fix this issue.`,
-                    `Read about the error and how to address it here: https://nx.dev/recipes/troubleshooting/unknown-local-cache`,
+                    `Read about the error and how to address it here: https://nx.dev/troubleshooting/unknown-local-cache`,
                     ``,
                 ].join('\n');
                 throw new Error(error);

package/src/utils/logger.d.ts

@@ -7,5 +7,6 @@ export declare const logger: {
     log: (...s: any[]) => void;
     debug: (...s: any[]) => void;
     fatal: (...s: any[]) => void;
+    verbose: (...s: any[]) => void;
 };
 export declare function stripIndent(str: string): string;

package/src/utils/logger.js

@@ -34,6 +34,11 @@ exports.logger = {
     fatal: (...s) => {
         console.error(...s);
     },
+    verbose: (...s) => {
+        if (process.env.NX_VERBOSE_LOGGING) {
+            console.log(...s);
+        }
+    },
 };
 function stripIndent(str) {
     const match = str.match(/^[ \t]*(?=\S)/gm);

package/src/utils/nx-plugin.deprecated.d.ts

@@ -1,6 +1,6 @@
 import { ProjectGraphProcessor } from '../config/project-graph';
 import { TargetConfiguration } from '../config/workspace-json-project-json';
-import { LoadedNxPlugin } from './nx-plugin';
+import { NxPluginV2 } from '../project-graph/plugins';
 /**
  * @deprecated Add targets to the projects in a {@link CreateNodes} function instead. This will be removed in Nx 19
  */
@@ -28,4 +28,4 @@ export type NxPluginV1 = {
 /**
  * @todo(@agentender) v19: Remove this fn when we remove readWorkspaceConfig
  */
-export declare function getDefaultPluginsSync(root: string): LoadedNxPlugin[];
+export declare function getDefaultPluginsSync(root: string): NxPluginV2[];

package/src/utils/nx-plugin.deprecated.js

@@ -4,7 +4,7 @@ exports.getDefaultPluginsSync = void 0;
 const angular_json_1 = require("../adapter/angular-json");
 const project_json_1 = require("../plugins/project-json/build-nodes/project-json");
 const target_defaults_plugin_1 = require("../plugins/target-defaults/target-defaults-plugin");
-const package_json_workspaces_1 = require("../plugins/package-json-workspaces");
+const PackageJsonWorkspacesPlugin = require("../plugins/package-json-workspaces");
 /**
  * @todo(@agentender) v19: Remove this fn when we remove readWorkspaceConfig
  */
@@ -14,12 +14,10 @@ function getDefaultPluginsSync(root) {
         ...((0, angular_json_1.shouldMergeAngularProjects)(root, false)
             ? [require('../adapter/angular-json').NxAngularJsonPlugin]
             : []),
-        target_defaults_plugin_1.TargetDefaultsPlugin,
-        (0, package_json_workspaces_1.getNxPackageJsonWorkspacesPlugin)(root),
-        project_json_1.ProjectJsonProjectsPlugin,
+        target_defaults_plugin_1.default,
+        PackageJsonWorkspacesPlugin,
+        project_json_1.default,
     ];
-    return plugins.map((p) => ({
-        plugin: p,
-    }));
+    return plugins;
 }
 exports.getDefaultPluginsSync = getDefaultPluginsSync;

package/src/utils/plugins/plugin-capabilities.d.ts

@@ -1,4 +1,4 @@
-import type { PluginCapabilities } from './models';
 import { ProjectConfiguration } from '../../config/workspace-json-project-json';
+import type { PluginCapabilities } from './models';
 export declare function getPluginCapabilities(workspaceRoot: string, pluginName: string, projects: Record<string, ProjectConfiguration>, includeRuntimeCapabilities?: boolean): Promise<PluginCapabilities | null>;
 export declare function listPluginCapabilities(pluginName: string, projects: Record<string, ProjectConfiguration>): Promise<void>;

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

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listPluginCapabilities = exports.getPluginCapabilities = void 0;
-const workspace_root_1 = require("../workspace-root");
 const chalk = require("chalk");
 const path_1 = require("path");
-const output_1 = require("../output");
-const shared_1 = require("./shared");
+const plugins_1 = require("../../project-graph/plugins");
+const loader_1 = require("../../project-graph/plugins/loader");
 const fileutils_1 = require("../fileutils");
-const package_manager_1 = require("../package-manager");
-const nx_plugin_1 = require("../nx-plugin");
 const installation_directory_1 = require("../installation-directory");
+const output_1 = require("../output");
+const package_manager_1 = require("../package-manager");
+const workspace_root_1 = require("../workspace-root");
+const shared_1 = require("./shared");
 function tryGetCollection(packageJsonPath, collectionFile, propName) {
     if (!collectionFile) {
         return null;
@@ -24,9 +25,9 @@ function tryGetCollection(packageJsonPath, collectionFile, propName) {
 }
 async function getPluginCapabilities(workspaceRoot, pluginName, projects, includeRuntimeCapabilities = false) {
     try {
-        const { json: packageJson, path: packageJsonPath } = await (0, nx_plugin_1.readPluginPackageJson)(pluginName, projects, (0, installation_directory_1.getNxRequirePaths)(workspaceRoot));
+        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,
@@ -56,17 +57,22 @@ 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 ??
+        if (packageJson.generators ??
             packageJson.executors ??
             packageJson['nx-migrations'] ??
             packageJson['schematics'] ??
-            packageJson['builders'])
-            ? (await (0, nx_plugin_1.loadNxPluginAsync)(packageJson.name, (0, installation_directory_1.getNxRequirePaths)(workspaceRoot), projects, workspaceRoot)).plugin
-            : {
+            packageJson['builders']) {
+            const [pluginPromise] = (0, loader_1.loadNxPlugin)(packageJson.name, workspaceRoot);
+            const plugin = await pluginPromise;
+            return plugin;
+        }
+        else {
+            return {
                 name: packageJson.name,
             };
+        }
     }
     catch {
         return null;