nx 19.2.0-canary.20240530-316dcb9 → 19.2.0-canary.20240601-6f22300

package/src/plugins/js/project-graph/build-dependencies/target-project-locator.js

@@ -1,36 +1,65 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TargetProjectLocator = void 0;
-const typescript_1 = require("../../utils/typescript");
+exports.TargetProjectLocator = exports.isBuiltinModuleImport = void 0;
+const node_module_1 = require("node:module");
+const node_path_1 = require("node:path");
+const find_project_for_path_1 = require("../../../../project-graph/utils/find-project-for-path");
 const fileutils_1 = require("../../../../utils/fileutils");
-const path_1 = require("path");
 const workspace_root_1 = require("../../../../utils/workspace-root");
-const module_1 = require("module");
-const find_project_for_path_1 = require("../../../../project-graph/utils/find-project-for-path");
+const resolve_relative_to_dir_1 = require("../../utils/resolve-relative-to-dir");
+const typescript_1 = require("../../utils/typescript");
+/**
+ * Use a shared cache to avoid repeated npm package resolution work within the TargetProjectLocator.
+ */
+const defaultNpmResolutionCache = new Map();
 const builtInModuleSet = new Set([
-    ...module_1.builtinModules,
-    ...module_1.builtinModules.map((x) => `node:${x}`),
+    ...node_module_1.builtinModules,
+    ...node_module_1.builtinModules.map((x) => `node:${x}`),
 ]);
+function isBuiltinModuleImport(importExpr) {
+    const packageName = parsePackageNameFromImportExpression(importExpr);
+    return builtInModuleSet.has(packageName);
+}
+exports.isBuiltinModuleImport = isBuiltinModuleImport;
 class TargetProjectLocator {
-    constructor(nodes, externalNodes) {
+    constructor(nodes, externalNodes = {}, npmResolutionCache = defaultNpmResolutionCache) {
         this.nodes = nodes;
         this.externalNodes = externalNodes;
+        this.npmResolutionCache = npmResolutionCache;
         this.projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(this.nodes);
-        this.npmProjects = filterRootExternalDependencies(this.externalNodes);
         this.tsConfig = this.getRootTsConfig();
         this.paths = this.tsConfig.config?.compilerOptions?.paths;
         this.typescriptResolutionCache = new Map();
-        this.npmResolutionCache = new Map();
+        /**
+         * Only the npm external nodes should be included.
+         *
+         * Unlike the raw externalNodes, ensure that there is always copy of the node where the version
+         * is set in the key for optimal lookup.
+         */
+        this.npmProjects = Object.values(this.externalNodes).reduce((acc, node) => {
+            if (node.type === 'npm') {
+                const keyWithVersion = `npm:${node.data.packageName}@${node.data.version}`;
+                if (!acc[node.name]) {
+                    acc[node.name] = node;
+                }
+                // The node.name may have already contained the version
+                if (!acc[keyWithVersion]) {
+                    acc[keyWithVersion] = node;
+                }
+            }
+            return acc;
+        }, {});
     }
     /**
-     * Find a project based on its import
+     * Resolve any workspace or external project that matches the given import expression,
+     * originating from the given filePath.
      *
      * @param importExpr
      * @param filePath
      */
-    findProjectWithImport(importExpr, filePath) {
+    findProjectFromImport(importExpr, filePath) {
         if ((0, fileutils_1.isRelativePath)(importExpr)) {
-            const resolvedModule = path_1.posix.join((0, path_1.dirname)(filePath), importExpr);
+            const resolvedModule = node_path_1.posix.join((0, node_path_1.dirname)(filePath), importExpr);
             return this.findProjectOfResolvedModule(resolvedModule);
         }
         // find project using tsconfig paths
@@ -39,7 +68,7 @@ class TargetProjectLocator {
             const [path, paths] = results;
             for (let p of paths) {
                 const r = p.endsWith('/*')
-                    ? (0, path_1.join)((0, path_1.dirname)(p), (0, path_1.relative)(path.replace(/\*$/, ''), importExpr))
+                    ? (0, node_path_1.join)((0, node_path_1.dirname)(p), (0, node_path_1.relative)(path.replace(/\*$/, ''), importExpr))
                     : p;
                 const maybeResolvedProject = this.findProjectOfResolvedModule(r);
                 if (maybeResolvedProject) {
@@ -47,14 +76,14 @@ class TargetProjectLocator {
                 }
             }
         }
-        if (builtInModuleSet.has(importExpr)) {
+        if (isBuiltinModuleImport(importExpr)) {
             this.npmResolutionCache.set(importExpr, null);
             return null;
         }
         // try to find npm package before using expensive typescript resolution
-        const npmProject = this.findNpmPackage(importExpr);
-        if (npmProject) {
-            return npmProject;
+        const externalProject = this.findNpmProjectFromImport(importExpr, filePath);
+        if (externalProject) {
+            return externalProject;
         }
         if (this.tsConfig.config) {
             // TODO(meeroslav): this block is probably obsolete
@@ -74,6 +103,55 @@ class TargetProjectLocator {
         this.npmResolutionCache.set(importExpr, null);
         return null;
     }
+    /**
+     * Resolve any external project that matches the given import expression,
+     * relative to the given file path.
+     *
+     * @param importExpr
+     * @param projectRoot
+     */
+    findNpmProjectFromImport(importExpr, fromFilePath) {
+        const packageName = parsePackageNameFromImportExpression(importExpr);
+        let fullFilePath = fromFilePath;
+        let workspaceRelativeFilePath = fromFilePath;
+        if (fromFilePath.startsWith(workspace_root_1.workspaceRoot)) {
+            workspaceRelativeFilePath = fromFilePath.replace(workspace_root_1.workspaceRoot, '');
+        }
+        else {
+            fullFilePath = (0, node_path_1.join)(workspace_root_1.workspaceRoot, fromFilePath);
+        }
+        const fullDirPath = (0, node_path_1.dirname)(fullFilePath);
+        const workspaceRelativeDirPath = (0, node_path_1.dirname)(workspaceRelativeFilePath);
+        const npmImportForProject = `${packageName}__${workspaceRelativeDirPath}`;
+        if (this.npmResolutionCache.has(npmImportForProject)) {
+            return this.npmResolutionCache.get(npmImportForProject);
+        }
+        try {
+            // package.json refers to an external package, we do not match against the version found in there, we instead try and resolve the relevant package how node would
+            const externalPackageJson = this.readPackageJson(packageName, fullDirPath);
+            // The external package.json path might be not be resolvable, e.g. if a reference has been added to a project package.json, but the install command has not been run yet.
+            if (!externalPackageJson) {
+                // Try and fall back to resolving an external node from the graph by name
+                const externalNode = this.npmProjects[`npm:${packageName}`];
+                const externalNodeName = externalNode?.name || null;
+                this.npmResolutionCache.set(npmImportForProject, externalNodeName);
+                return externalNodeName;
+            }
+            const npmProjectKey = `npm:${externalPackageJson.name}@${externalPackageJson.version}`;
+            const matchingExternalNode = this.npmProjects[npmProjectKey];
+            if (!matchingExternalNode) {
+                return null;
+            }
+            this.npmResolutionCache.set(npmImportForProject, matchingExternalNode.name);
+            return matchingExternalNode.name;
+        }
+        catch (e) {
+            if (process.env.NX_VERBOSE_LOGGING === 'true') {
+                console.error(e);
+            }
+            return null;
+        }
+    }
     /**
      * Return file paths matching the import relative to the repo root
      * @param normalizedImportExpr
@@ -113,23 +191,10 @@ class TargetProjectLocator {
         return;
     }
     resolveImportWithRequire(normalizedImportExpr, filePath) {
-        return path_1.posix.relative(workspace_root_1.workspaceRoot, require.resolve(normalizedImportExpr, {
-            paths: [(0, path_1.dirname)(filePath)],
+        return node_path_1.posix.relative(workspace_root_1.workspaceRoot, require.resolve(normalizedImportExpr, {
+            paths: [(0, node_path_1.dirname)(filePath)],
         }));
     }
-    findNpmPackage(npmImport) {
-        if (this.npmResolutionCache.has(npmImport)) {
-            return this.npmResolutionCache.get(npmImport);
-        }
-        else {
-            const pkg = this.npmProjects.find((pkg) => npmImport === pkg.data.packageName ||
-                npmImport.startsWith(`${pkg.data.packageName}/`));
-            if (pkg) {
-                this.npmResolutionCache.set(npmImport, pkg.name);
-                return pkg.name;
-            }
-        }
-    }
     findProjectOfResolvedModule(resolvedModule) {
         if (resolvedModule.startsWith('node_modules/') ||
             resolvedModule.includes('/node_modules/')) {
@@ -142,7 +207,7 @@ class TargetProjectLocator {
         return importedProject ? importedProject.name : void 0;
     }
     getAbsolutePath(path) {
-        return (0, path_1.join)(workspace_root_1.workspaceRoot, path);
+        return (0, node_path_1.join)(workspace_root_1.workspaceRoot, path);
     }
     getRootTsConfig() {
         const path = (0, typescript_1.getRootTsConfigFileName)();
@@ -164,20 +229,54 @@ class TargetProjectLocator {
         const project = (0, find_project_for_path_1.findProjectForPath)(file, this.projectRootMappings);
         return this.nodes[project];
     }
+    /**
+     * In many cases the package.json will be directly resolvable, so we try that first.
+     * If, however, package exports are used and the package.json is not defined, we will
+     * need to resolve the main entry point of the package and traverse upwards to find the
+     * package.json.
+     *
+     * In some cases, such as when multiple module formats are published, the resolved package.json
+     * might only contain the "type" field - no "name" or "version", so in such cases we keep traversing
+     * until we find a package.json that contains the "name" and "version" fields.
+     */
+    readPackageJson(packageName, relativeToDir) {
+        // The package.json is directly resolvable
+        const packageJsonPath = (0, resolve_relative_to_dir_1.resolveRelativeToDir)((0, node_path_1.join)(packageName, 'package.json'), relativeToDir);
+        if (packageJsonPath) {
+            return (0, fileutils_1.readJsonFile)(packageJsonPath);
+        }
+        try {
+            // Resolve the main entry point of the package
+            const mainPath = (0, resolve_relative_to_dir_1.resolveRelativeToDir)(packageName, relativeToDir);
+            let dir = (0, node_path_1.dirname)(mainPath);
+            while (dir !== (0, node_path_1.parse)(dir).root) {
+                const packageJsonPath = (0, node_path_1.join)(dir, 'package.json');
+                try {
+                    const parsedPackageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
+                    // Ensure the package.json contains the "name" and "version" fields
+                    if (parsedPackageJson.name && parsedPackageJson.version) {
+                        return parsedPackageJson;
+                    }
+                }
+                catch {
+                    // Package.json doesn't exist, keep traversing
+                }
+                dir = (0, node_path_1.dirname)(dir);
+            }
+            return null;
+        }
+        catch {
+            return null;
+        }
+    }
 }
 exports.TargetProjectLocator = TargetProjectLocator;
-// matches `npm:@scope/name`, `npm:name` but not `npm:@scope/name@version` and `npm:name@version`
-const ROOT_VERSION_PACKAGE_NAME_REGEX = /^npm:(?!.+@.+)/;
-function filterRootExternalDependencies(externalNodes) {
-    if (!externalNodes) {
-        return [];
-    }
-    const keys = Object.keys(externalNodes);
-    const nodes = [];
-    for (let i = 0; i < keys.length; i++) {
-        if (keys[i].match(ROOT_VERSION_PACKAGE_NAME_REGEX)) {
-            nodes.push(externalNodes[keys[i]]);
-        }
+function parsePackageNameFromImportExpression(importExpression) {
+    // Check if the package is scoped
+    if (importExpression.startsWith('@')) {
+        // For scoped packages, the package name is up to the second '/'
+        return importExpression.split('/').slice(0, 2).join('/');
     }
-    return nodes;
+    // For unscoped packages, the package name is up to the first '/'
+    return importExpression.split('/')[0];
 }

package/src/plugins/js/utils/resolve-relative-to-dir.d.ts

@@ -0,0 +1,5 @@
+/**
+ * NOTE: This function is in its own file because it is not possible to mock
+ * require.resolve directly in jest https://github.com/jestjs/jest/issues/9543
+ */
+export declare function resolveRelativeToDir(path: string, relativeToDir: any): string;

package/src/plugins/js/utils/resolve-relative-to-dir.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveRelativeToDir = void 0;
+/**
+ * NOTE: This function is in its own file because it is not possible to mock
+ * require.resolve directly in jest https://github.com/jestjs/jest/issues/9543
+ */
+function resolveRelativeToDir(path, relativeToDir) {
+    try {
+        return require.resolve(path, {
+            paths: [relativeToDir],
+        });
+    }
+    catch {
+        return null;
+    }
+}
+exports.resolveRelativeToDir = resolveRelativeToDir;

package/src/project-graph/error-types.d.ts

@@ -1,10 +1,10 @@
-import { CreateNodesResultWithContext } from './plugins/internal-api';
 import { ConfigurationResult, ConfigurationSourceMaps } from './utils/project-configuration-utils';
 import { ProjectConfiguration } from '../config/workspace-json-project-json';
 import { ProjectGraph } from '../config/project-graph';
+import { CreateNodesFunctionV2 } from './plugins';
 export declare class ProjectGraphError extends Error {
     #private;
-    constructor(errors: Array<CreateNodesError | MergeNodesError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError | ProcessDependenciesError | ProcessProjectGraphError | CreateMetadataError | WorkspaceValidityError>, partialProjectGraph: ProjectGraph, partialSourceMaps: ConfigurationSourceMaps);
+    constructor(errors: Array<AggregateCreateNodesError | MergeNodesError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError | ProcessDependenciesError | ProcessProjectGraphError | CreateMetadataError | WorkspaceValidityError>, partialProjectGraph: ProjectGraph, partialSourceMaps: ConfigurationSourceMaps);
     /**
      * The daemon cannot throw errors which contain methods as they are not serializable.
      *
@@ -18,7 +18,7 @@ export declare class ProjectGraphError extends Error {
      */
     getPartialProjectGraph(): ProjectGraph;
     getPartialSourcemaps(): ConfigurationSourceMaps;
-    getErrors(): (CreateNodesError | MergeNodesError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError | CreateMetadataError | ProcessDependenciesError | ProcessProjectGraphError | WorkspaceValidityError)[];
+    getErrors(): (AggregateCreateNodesError | MergeNodesError | CreateMetadataError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError | ProcessDependenciesError | ProcessProjectGraphError | WorkspaceValidityError)[];
 }
 export declare class MultipleProjectsWithSameNameError extends Error {
     conflicts: Map<string, string[]>;
@@ -44,25 +44,44 @@ export declare class ProjectWithNoNameError extends Error {
 }
 export declare function isProjectWithNoNameError(e: unknown): e is ProjectWithNoNameError;
 export declare class ProjectConfigurationsError extends Error {
-    readonly errors: Array<MergeNodesError | CreateNodesError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError>;
+    readonly errors: Array<MergeNodesError | AggregateCreateNodesError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError>;
     readonly partialProjectConfigurationsResult: ConfigurationResult;
-    constructor(errors: Array<MergeNodesError | CreateNodesError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError>, partialProjectConfigurationsResult: ConfigurationResult);
+    constructor(errors: Array<MergeNodesError | AggregateCreateNodesError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError>, partialProjectConfigurationsResult: ConfigurationResult);
 }
 export declare function isProjectConfigurationsError(e: unknown): e is ProjectConfigurationsError;
-export declare class CreateNodesError extends Error {
-    file: string;
-    pluginName: string;
-    constructor({ file, pluginName, error, }: {
-        file: string;
-        pluginName: string;
-        error: Error;
-    });
-}
+/**
+ * This error should be thrown when a `createNodesV2` function hits a recoverable error.
+ * It allows Nx to recieve partial results and continue processing for better UX.
+ */
 export declare class AggregateCreateNodesError extends Error {
-    readonly pluginName: string;
-    readonly errors: Array<CreateNodesError>;
-    readonly partialResults: Array<CreateNodesResultWithContext>;
-    constructor(pluginName: string, errors: Array<CreateNodesError>, partialResults: Array<CreateNodesResultWithContext>);
+    readonly errors: Array<[file: string | null, error: Error]>;
+    readonly partialResults: Awaited<ReturnType<CreateNodesFunctionV2>>;
+    /**
+     * Throwing this error from a `createNodesV2` function will allow Nx to continue processing and recieve partial results from your plugin.
+     * @example
+     * export async function createNodesV2(
+     *  files: string[],
+     * ) {
+     *   const partialResults = [];
+     *   const errors = [];
+     *   await Promise.all(files.map(async (file) => {
+     *     try {
+     *        const result = await createNodes(file);
+     *        partialResults.push(result);
+     *     } catch (e) {
+     *        errors.push([file, e]);
+     *     }
+     *   }));
+     *  if (errors.length > 0) {
+     *     throw new AggregateCreateNodesError(errors, partialResults);
+     *   }
+     *   return partialResults;
+     * }
+     *
+     * @param errors An array of tuples that represent errors encountered when processing a given file. An example entry might look like ['path/to/project.json', [Error: 'Invalid JSON. Unexpected token 'a' in JSON at position 0]]
+     * @param partialResults The partial results of the `createNodesV2` function. This should be the results for each file that didn't encounter an issue.
+     */
+    constructor(errors: Array<[file: string | null, error: Error]>, partialResults: Awaited<ReturnType<CreateNodesFunctionV2>>);
 }
 export declare class MergeNodesError extends Error {
     file: string;
@@ -102,7 +121,6 @@ export declare class AggregateProjectGraphError extends Error {
 }
 export declare function isAggregateProjectGraphError(e: unknown): e is AggregateProjectGraphError;
 export declare function isCreateMetadataError(e: unknown): e is CreateMetadataError;
-export declare function isCreateNodesError(e: unknown): e is CreateNodesError;
 export declare function isAggregateCreateNodesError(e: unknown): e is AggregateCreateNodesError;
 export declare function isMergeNodesError(e: unknown): e is MergeNodesError;
 export declare class DaemonProjectGraphError extends Error {

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

@@ -1,7 +1,7 @@
 "use strict";
 var _ProjectGraphError_errors, _ProjectGraphError_partialProjectGraph, _ProjectGraphError_partialSourceMaps;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoadPluginError = exports.DaemonProjectGraphError = exports.isMergeNodesError = exports.isAggregateCreateNodesError = exports.isCreateNodesError = exports.isCreateMetadataError = exports.isAggregateProjectGraphError = exports.AggregateProjectGraphError = exports.ProcessProjectGraphError = exports.isWorkspaceValidityError = exports.WorkspaceValidityError = exports.ProcessDependenciesError = exports.CreateMetadataError = exports.MergeNodesError = exports.AggregateCreateNodesError = exports.CreateNodesError = exports.isProjectConfigurationsError = exports.ProjectConfigurationsError = exports.isProjectWithNoNameError = exports.ProjectWithNoNameError = exports.isProjectsWithNoNameError = exports.ProjectsWithNoNameError = exports.isMultipleProjectsWithSameNameError = exports.isProjectWithExistingNameError = exports.ProjectWithExistingNameError = exports.MultipleProjectsWithSameNameError = exports.ProjectGraphError = void 0;
+exports.LoadPluginError = exports.DaemonProjectGraphError = exports.isMergeNodesError = exports.isAggregateCreateNodesError = exports.isCreateMetadataError = exports.isAggregateProjectGraphError = exports.AggregateProjectGraphError = exports.ProcessProjectGraphError = exports.isWorkspaceValidityError = exports.WorkspaceValidityError = exports.ProcessDependenciesError = exports.CreateMetadataError = exports.MergeNodesError = exports.AggregateCreateNodesError = exports.isProjectConfigurationsError = exports.ProjectConfigurationsError = exports.isProjectWithNoNameError = exports.ProjectWithNoNameError = exports.isProjectsWithNoNameError = exports.ProjectsWithNoNameError = exports.isMultipleProjectsWithSameNameError = exports.isProjectWithExistingNameError = exports.ProjectWithExistingNameError = exports.MultipleProjectsWithSameNameError = exports.ProjectGraphError = void 0;
 const tslib_1 = require("tslib");
 class ProjectGraphError extends Error {
     constructor(errors, partialProjectGraph, partialSourceMaps) {
@@ -126,21 +126,38 @@ function isProjectConfigurationsError(e) {
             e?.name === ProjectConfigurationsError.name));
 }
 exports.isProjectConfigurationsError = isProjectConfigurationsError;
-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;
+/**
+ * This error should be thrown when a `createNodesV2` function hits a recoverable error.
+ * It allows Nx to recieve partial results and continue processing for better UX.
+ */
 class AggregateCreateNodesError extends Error {
-    constructor(pluginName, errors, partialResults) {
+    /**
+     * Throwing this error from a `createNodesV2` function will allow Nx to continue processing and recieve partial results from your plugin.
+     * @example
+     * export async function createNodesV2(
+     *  files: string[],
+     * ) {
+     *   const partialResults = [];
+     *   const errors = [];
+     *   await Promise.all(files.map(async (file) => {
+     *     try {
+     *        const result = await createNodes(file);
+     *        partialResults.push(result);
+     *     } catch (e) {
+     *        errors.push([file, e]);
+     *     }
+     *   }));
+     *  if (errors.length > 0) {
+     *     throw new AggregateCreateNodesError(errors, partialResults);
+     *   }
+     *   return partialResults;
+     * }
+     *
+     * @param errors An array of tuples that represent errors encountered when processing a given file. An example entry might look like ['path/to/project.json', [Error: 'Invalid JSON. Unexpected token 'a' in JSON at position 0]]
+     * @param partialResults The partial results of the `createNodesV2` function. This should be the results for each file that didn't encounter an issue.
+     */
+    constructor(errors, partialResults) {
         super('Failed to create nodes');
-        this.pluginName = pluginName;
         this.errors = errors;
         this.partialResults = partialResults;
         this.name = this.constructor.name;
@@ -230,11 +247,6 @@ function isCreateMetadataError(e) {
             e?.name === CreateMetadataError.name));
 }
 exports.isCreateMetadataError = isCreateMetadataError;
-function isCreateNodesError(e) {
-    return (e instanceof CreateNodesError ||
-        (typeof e === 'object' && 'name' in e && e?.name === CreateNodesError.name));
-}
-exports.isCreateNodesError = isCreateNodesError;
 function isAggregateCreateNodesError(e) {
     return (e instanceof AggregateCreateNodesError ||
         (typeof e === 'object' &&

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateFileMap = exports.createFileMap = exports.createFileMapUsingProjectGraph = exports.createProjectFileMapUsingProjectGraph = void 0;
-const client_1 = require("../daemon/client/client");
 const workspace_context_1 = require("../utils/workspace-context");
 const workspace_root_1 = require("../utils/workspace-root");
 const project_graph_1 = require("./project-graph");
@@ -14,13 +13,7 @@ exports.createProjectFileMapUsingProjectGraph = createProjectFileMapUsingProject
 // TODO: refactor this to pull straight from the rust context instead of creating the file map in JS
 async function createFileMapUsingProjectGraph(graph) {
     const configs = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(graph);
-    let files;
-    if (client_1.daemonClient.enabled()) {
-        files = await client_1.daemonClient.getAllFileData();
-    }
-    else {
-        files = (0, workspace_context_1.getAllFileDataInContext)(workspace_root_1.workspaceRoot);
-    }
+    let files = await (0, workspace_context_1.getAllFileDataInContext)(workspace_root_1.workspaceRoot);
     return createFileMap(configs, files);
 }
 exports.createFileMapUsingProjectGraph = createFileMapUsingProjectGraph;

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

@@ -11,11 +11,10 @@ const json_diff_1 = require("../utils/json-diff");
 const project_graph_1 = require("./project-graph");
 const angular_json_1 = require("../adapter/angular-json");
 const ignore_1 = require("../utils/ignore");
-const retrieve_workspace_files_1 = require("./utils/retrieve-workspace-files");
 const project_configuration_utils_1 = require("./utils/project-configuration-utils");
-const nx_plugin_deprecated_1 = require("../utils/nx-plugin.deprecated");
-const minimatch_1 = require("minimatch");
-const package_json_next_to_project_json_1 = require("../plugins/project-json/build-nodes/package-json-next-to-project-json");
+const package_json_workspaces_1 = require("../plugins/package-json-workspaces");
+const workspace_context_1 = require("../utils/workspace-context");
+const project_json_1 = require("../plugins/project-json/build-nodes/project-json");
 class WholeFileChange {
     constructor() {
         this.type = 'WholeFileChange';
@@ -115,7 +114,7 @@ function readWorkspaceConfig(opts) {
     catch {
         configuration = {
             version: 2,
-            projects: getProjectsSyncNoInference(root, nxJson).projects,
+            projects: getProjectsSync(root, nxJson),
         };
     }
     if (opts.format === 'angularCli') {
@@ -142,38 +141,38 @@ exports.readPackageJson = readPackageJson;
 /**
  * TODO(v20): Remove this function.
  */
-function getProjectsSyncNoInference(root, nxJson) {
-    const allConfigFiles = (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(root, (0, nx_plugin_deprecated_1.getDefaultPluginsSync)(root));
-    const plugins = [
-        package_json_next_to_project_json_1.PackageJsonProjectsNextToProjectJsonPlugin,
-        ...(0, nx_plugin_deprecated_1.getDefaultPluginsSync)(root),
+function getProjectsSync(root, nxJson) {
+    /**
+     * We can't update projects that come from plugins anyways, so we are going
+     * to ignore them for now. Plugins should add their own add/create/update methods
+     * if they would like to use devkit to update inferred projects.
+     */
+    const patterns = [
+        '**/project.json',
+        'project.json',
+        ...(0, package_json_workspaces_1.getGlobPatternsFromPackageManagerWorkspaces)(root, fileutils_1.readJsonFile),
     ];
-    const projectRootMap = {};
-    // We iterate over plugins first - this ensures that plugins specified first take precedence.
-    for (const plugin of plugins) {
-        const [pattern, createNodes] = plugin.createNodes ?? [];
-        if (!pattern) {
-            continue;
+    const projectFiles = (0, workspace_context_1.globWithWorkspaceContextSync)(root, patterns);
+    const rootMap = {};
+    for (const projectFile of projectFiles) {
+        if ((0, path_1.basename)(projectFile) === 'project.json') {
+            const json = (0, fileutils_1.readJsonFile)(projectFile);
+            const config = (0, project_json_1.buildProjectFromProjectJson)(json, projectFile);
+            (0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(rootMap, config, undefined, undefined, true);
         }
-        const matchingConfigFiles = allConfigFiles.filter((file) => (0, minimatch_1.minimatch)(file, pattern, { dot: true }));
-        for (const file of matchingConfigFiles) {
-            if ((0, minimatch_1.minimatch)(file, pattern, { dot: true })) {
-                let r = createNodes(file, {}, {
-                    nxJsonConfiguration: nxJson,
-                    workspaceRoot: root,
-                    configFiles: matchingConfigFiles,
-                });
-                for (const node in r.projects) {
-                    const project = {
-                        root: node,
-                        ...r.projects[node],
-                    };
-                    (0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(projectRootMap, project);
-                }
+        else if ((0, path_1.basename)(projectFile) === 'package.json') {
+            const packageJson = (0, fileutils_1.readJsonFile)(projectFile);
+            const config = (0, package_json_workspaces_1.buildProjectConfigurationFromPackageJson)(packageJson, projectFile, nxJson);
+            if (!rootMap[config.root]) {
+                (0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(rootMap, 
+                // Inferred targets, tags, etc don't show up when running generators
+                // This is to help avoid running into issues when trying to update the workspace
+                {
+                    name: config.name,
+                    root: config.root,
+                }, undefined, undefined, true);
             }
         }
     }
-    return {
-        projects: (0, project_configuration_utils_1.readProjectConfigurationsFromRootMap)(projectRootMap),
-    };
+    return (0, project_configuration_utils_1.readProjectConfigurationsFromRootMap)(rootMap);
 }

package/src/project-graph/plugins/index.d.ts

@@ -1,2 +1,3 @@
 export * from './public-api';
 export { readPluginPackageJson, registerPluginTSTranspiler } from './loader';
+export { createNodesFromFiles } from './utils';

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

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerPluginTSTranspiler = exports.readPluginPackageJson = void 0;
+exports.createNodesFromFiles = exports.registerPluginTSTranspiler = exports.readPluginPackageJson = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./public-api"), exports);
 var loader_1 = require("./loader");
 Object.defineProperty(exports, "readPluginPackageJson", { enumerable: true, get: function () { return loader_1.readPluginPackageJson; } });
 Object.defineProperty(exports, "registerPluginTSTranspiler", { enumerable: true, get: function () { return loader_1.registerPluginTSTranspiler; } });
+var utils_1 = require("./utils");
+Object.defineProperty(exports, "createNodesFromFiles", { enumerable: true, get: function () { return utils_1.createNodesFromFiles; } });

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

@@ -1,12 +1,12 @@
 import { PluginConfiguration } from '../../config/nx-json';
 import { NxPluginV1 } from '../../utils/nx-plugin.deprecated';
-import { CreateDependencies, CreateDependenciesContext, CreateMetadata, CreateMetadataContext, CreateNodesContext, CreateNodesResult, NxPluginV2 } from './public-api';
+import { CreateDependencies, CreateDependenciesContext, CreateMetadata, CreateMetadataContext, CreateNodesContextV2, CreateNodesResult, NxPluginV2 } from './public-api';
 import { ProjectGraph, ProjectGraphProcessor } from '../../config/project-graph';
 export declare class LoadedNxPlugin {
     readonly name: string;
     readonly createNodes?: [
         filePattern: string,
-        fn: (matchedFiles: string[], context: CreateNodesContext) => Promise<CreateNodesResultWithContext[]>
+        fn: (matchedFiles: string[], context: CreateNodesContextV2) => Promise<Array<readonly [plugin: string, file: string, result: CreateNodesResult]>>
     ];
     readonly createDependencies?: (context: CreateDependenciesContext) => ReturnType<CreateDependencies>;
     readonly createMetadata?: (graph: ProjectGraph, context: CreateMetadataContext) => ReturnType<CreateMetadata>;