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

package/src/daemon/message-types/update-context-files.d.ts

@@ -0,0 +1,7 @@
+export declare const GLOB: "GLOB";
+export type HandleUpdateContextMessage = {
+    type: typeof GLOB;
+    updatedFiles: string[];
+    deletedFiles: string[];
+};
+export declare function isHandleUpdateContextMessage(message: unknown): message is HandleUpdateContextMessage;

package/src/daemon/message-types/update-context-files.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isHandleUpdateContextMessage = exports.GLOB = void 0;
+exports.GLOB = 'GLOB';
+function isHandleUpdateContextMessage(message) {
+    return (typeof message === 'object' &&
+        message !== null &&
+        'type' in message &&
+        message['type'] === exports.GLOB);
+}
+exports.isHandleUpdateContextMessage = isHandleUpdateContextMessage;

package/src/daemon/server/handle-context-file-data.d.ts

@@ -0,0 +1,2 @@
+import { HandlerResult } from './server';
+export declare function handleContextFileData(): Promise<HandlerResult>;

package/src/daemon/server/handle-context-file-data.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleContextFileData = void 0;
+const workspace_context_1 = require("../../utils/workspace-context");
+const workspace_root_1 = require("../../utils/workspace-root");
+async function handleContextFileData() {
+    const files = await (0, workspace_context_1.getAllFileDataInContext)(workspace_root_1.workspaceRoot);
+    return {
+        response: JSON.stringify(files),
+        description: 'handleContextFileData',
+    };
+}
+exports.handleContextFileData = handleContextFileData;

package/src/daemon/server/handle-get-files-in-directory.d.ts

@@ -0,0 +1,2 @@
+import { HandlerResult } from './server';
+export declare function handleGetFilesInDirectory(dir: string): Promise<HandlerResult>;

package/src/daemon/server/handle-get-files-in-directory.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleGetFilesInDirectory = void 0;
+const workspace_context_1 = require("../../utils/workspace-context");
+const workspace_root_1 = require("../../utils/workspace-root");
+async function handleGetFilesInDirectory(dir) {
+    const files = await (0, workspace_context_1.getFilesInDirectoryUsingContext)(workspace_root_1.workspaceRoot, dir);
+    return {
+        response: JSON.stringify(files),
+        description: 'handleNxWorkspaceFiles',
+    };
+}
+exports.handleGetFilesInDirectory = handleGetFilesInDirectory;

package/src/daemon/server/handle-glob.d.ts

@@ -0,0 +1,2 @@
+import { HandlerResult } from './server';
+export declare function handleGlob(globs: string[], exclude?: string[]): Promise<HandlerResult>;

package/src/daemon/server/handle-glob.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleGlob = void 0;
+const workspace_root_1 = require("../../utils/workspace-root");
+const workspace_context_1 = require("../../utils/workspace-context");
+async function handleGlob(globs, exclude) {
+    const files = await (0, workspace_context_1.globWithWorkspaceContext)(workspace_root_1.workspaceRoot, globs, exclude);
+    return {
+        response: JSON.stringify(files),
+        description: 'handleGlob',
+    };
+}
+exports.handleGlob = handleGlob;

package/src/daemon/server/handle-hash-glob.d.ts

@@ -0,0 +1,2 @@
+import { HandlerResult } from './server';
+export declare function handleHashGlob(globs: string[], exclude?: string[]): Promise<HandlerResult>;

package/src/daemon/server/handle-hash-glob.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleHashGlob = void 0;
+const workspace_root_1 = require("../../utils/workspace-root");
+const workspace_context_1 = require("../../utils/workspace-context");
+async function handleHashGlob(globs, exclude) {
+    const files = await (0, workspace_context_1.hashWithWorkspaceContext)(workspace_root_1.workspaceRoot, globs, exclude);
+    return {
+        response: JSON.stringify(files),
+        description: 'handleHashGlob',
+    };
+}
+exports.handleHashGlob = handleHashGlob;

package/src/daemon/server/handle-nx-workspace-files.d.ts

@@ -0,0 +1,2 @@
+import { HandlerResult } from './server';
+export declare function handleNxWorkspaceFiles(projectRootMap: Record<string, string>): Promise<HandlerResult>;

package/src/daemon/server/handle-nx-workspace-files.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleNxWorkspaceFiles = void 0;
+const workspace_context_1 = require("../../utils/workspace-context");
+const workspace_root_1 = require("../../utils/workspace-root");
+async function handleNxWorkspaceFiles(projectRootMap) {
+    const files = await (0, workspace_context_1.getNxWorkspaceFilesFromContext)(workspace_root_1.workspaceRoot, projectRootMap);
+    return {
+        response: JSON.stringify(files),
+        description: 'handleNxWorkspaceFiles',
+    };
+}
+exports.handleNxWorkspaceFiles = handleNxWorkspaceFiles;

package/src/daemon/server/server.js

@@ -18,7 +18,6 @@ const file_watcher_sockets_1 = require("./file-watching/file-watcher-sockets");
 const handle_hash_tasks_1 = require("./handle-hash-tasks");
 const handle_outputs_tracking_1 = require("./handle-outputs-tracking");
 const handle_process_in_background_1 = require("./handle-process-in-background");
-const handle_request_file_data_1 = require("./handle-request-file-data");
 const handle_request_project_graph_1 = require("./handle-request-project-graph");
 const handle_request_shutdown_1 = require("./handle-request-shutdown");
 const logger_1 = require("./logger");
@@ -26,9 +25,20 @@ const outputs_tracking_1 = require("./outputs-tracking");
 const project_graph_incremental_recomputation_1 = require("./project-graph-incremental-recomputation");
 const shutdown_utils_1 = require("./shutdown-utils");
 const watcher_1 = require("./watcher");
+const handle_glob_1 = require("./handle-glob");
+const glob_1 = require("../message-types/glob");
+const get_nx_workspace_files_1 = require("../message-types/get-nx-workspace-files");
+const handle_nx_workspace_files_1 = require("./handle-nx-workspace-files");
+const get_context_file_data_1 = require("../message-types/get-context-file-data");
+const handle_context_file_data_1 = require("./handle-context-file-data");
+const get_files_in_directory_1 = require("../message-types/get-files-in-directory");
+const handle_get_files_in_directory_1 = require("./handle-get-files-in-directory");
+const hash_glob_1 = require("../message-types/hash-glob");
+const handle_hash_glob_1 = require("./handle-hash-glob");
 let performanceObserver;
 let workspaceWatcherError;
 let outputsWatcherError;
+global.NX_DAEMON = true;
 let numberOfOpenConnections = 0;
 const server = (0, net_1.createServer)(async (socket) => {
     numberOfOpenConnections += 1;
@@ -59,8 +69,9 @@ async function handleMessage(socket, data) {
     if (workspaceWatcherError) {
         await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `File watcher error in the workspace '${workspace_root_1.workspaceRoot}'.`, workspaceWatcherError);
     }
-    if (daemonIsOutdated()) {
-        await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Lock files changed`, new Error('LOCK-FILES-CHANGED'));
+    const outdated = daemonIsOutdated();
+    if (outdated) {
+        await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Daemon outdated`, new Error(outdated));
     }
     (0, shutdown_utils_1.resetInactivityTimeout)(handleInactivityTimeout);
     const unparsedPayload = data;
@@ -80,9 +91,6 @@ async function handleMessage(socket, data) {
     else if (payload.type === 'HASH_TASKS') {
         await handleResult(socket, 'HASH_TASKS', () => (0, handle_hash_tasks_1.handleHashTasks)(payload));
     }
-    else if (payload.type === 'REQUEST_FILE_DATA') {
-        await handleResult(socket, 'REQUEST_FILE_DATA', () => (0, handle_request_file_data_1.handleRequestFileData)());
-    }
     else if (payload.type === 'PROCESS_IN_BACKGROUND') {
         await handleResult(socket, 'PROCESS_IN_BACKGROUND', () => (0, handle_process_in_background_1.handleProcessInBackground)(payload));
     }
@@ -98,6 +106,21 @@ async function handleMessage(socket, data) {
     else if (payload.type === 'REGISTER_FILE_WATCHER') {
         file_watcher_sockets_1.registeredFileWatcherSockets.push({ socket, config: payload.config });
     }
+    else if ((0, glob_1.isHandleGlobMessage)(payload)) {
+        await handleResult(socket, glob_1.GLOB, () => (0, handle_glob_1.handleGlob)(payload.globs, payload.exclude));
+    }
+    else if ((0, get_nx_workspace_files_1.isHandleNxWorkspaceFilesMessage)(payload)) {
+        await handleResult(socket, get_nx_workspace_files_1.GET_NX_WORKSPACE_FILES, () => (0, handle_nx_workspace_files_1.handleNxWorkspaceFiles)(payload.projectRootMap));
+    }
+    else if ((0, get_files_in_directory_1.isHandleGetFilesInDirectoryMessage)(payload)) {
+        await handleResult(socket, get_files_in_directory_1.GET_FILES_IN_DIRECTORY, () => (0, handle_get_files_in_directory_1.handleGetFilesInDirectory)(payload.dir));
+    }
+    else if ((0, get_context_file_data_1.isHandleContextFileDataMessage)(payload)) {
+        await handleResult(socket, get_context_file_data_1.GET_CONTEXT_FILE_DATA, () => (0, handle_context_file_data_1.handleContextFileData)());
+    }
+    else if ((0, hash_glob_1.isHandleHashGlobMessage)(payload)) {
+        await handleResult(socket, hash_glob_1.HASH_GLOB, () => (0, handle_hash_glob_1.handleHashGlob)(payload.globs, payload.exclude));
+    }
     else {
         await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Invalid payload from the client`, new Error(`Unsupported payload sent to daemon server: ${unparsedPayload}`));
     }
@@ -145,7 +168,13 @@ function registerProcessTerminationListeners() {
 }
 let existingLockHash;
 function daemonIsOutdated() {
-    return nxVersionChanged() || lockFileHashChanged();
+    if (nxVersionChanged()) {
+        return 'NX_VERSION_CHANGED';
+    }
+    else if (lockFileHashChanged()) {
+        return 'LOCK_FILES_CHANGED';
+    }
+    return null;
 }
 function nxVersionChanged() {
     return versions_1.nxVersion !== getInstalledNxVersion();
@@ -192,10 +221,11 @@ const handleWorkspaceChanges = async (err, changeEvents) => {
     }
     try {
         (0, shutdown_utils_1.resetInactivityTimeout)(handleInactivityTimeout);
-        if (daemonIsOutdated()) {
+        const outdatedReason = daemonIsOutdated();
+        if (outdatedReason) {
             await (0, shutdown_utils_1.handleServerProcessTermination)({
                 server,
-                reason: 'Lock file changed',
+                reason: outdatedReason,
             });
             return;
         }

package/src/devkit-exports.d.ts

@@ -15,7 +15,9 @@ export type { WorkspaceJsonConfiguration, ProjectsConfigurations, TargetDependen
  */
 export type { Generator, GeneratorCallback, Executor, ExecutorContext, TaskGraphExecutor, GeneratorsJson, ExecutorsJson, MigrationsJson, CustomHasher, HasherContext, } from './config/misc-interfaces';
 export { workspaceLayout } from './config/configuration';
-export type { NxPlugin, NxPluginV2, CreateNodes, CreateNodesFunction, CreateNodesResult, CreateNodesContext, CreateDependencies, CreateDependenciesContext, CreateMetadata, CreateMetadataContext, ProjectsMetadata, } from './project-graph/plugins';
+export type { NxPlugin, NxPluginV2, CreateNodes, CreateNodesFunction, CreateNodesResult, CreateNodesContext, CreateNodesContextV2, CreateNodesFunctionV2, CreateNodesResultV2, CreateNodesV2, CreateDependencies, CreateDependenciesContext, CreateMetadata, CreateMetadataContext, ProjectsMetadata, } from './project-graph/plugins';
+export { AggregateCreateNodesError } from './project-graph/error-types';
+export { createNodesFromFiles } from './project-graph/plugins';
 export type { NxPluginV1, ProjectTargetConfigurator, } from './utils/nx-plugin.deprecated';
 /**
  * @category Workspace
@@ -56,7 +58,7 @@ export { addProjectConfiguration, readProjectConfiguration, removeProjectConfigu
 /**
  * @category Generators
  */
-export { glob } from './generators/utils/glob';
+export { glob, globAsync } from './generators/utils/glob';
 /**
  * @category Generators
  */

package/src/devkit-exports.js

@@ -4,9 +4,13 @@
  * Try hard to not add to this API to reduce the surface area we need to maintain.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProjectFileMapUsingProjectGraph = exports.cacheDir = exports.hashArray = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readProjectsConfigurationFromProjectGraph = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.validateDependency = exports.ProjectGraphBuilder = exports.DependencyType = exports.updateNxJson = exports.readNxJson = exports.glob = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.isWorkspacesEnabled = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.workspaceLayout = void 0;
+exports.createProjectFileMapUsingProjectGraph = exports.cacheDir = exports.hashArray = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readProjectsConfigurationFromProjectGraph = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.validateDependency = exports.ProjectGraphBuilder = exports.DependencyType = exports.updateNxJson = exports.readNxJson = exports.globAsync = exports.glob = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.isWorkspacesEnabled = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.createNodesFromFiles = exports.AggregateCreateNodesError = exports.workspaceLayout = void 0;
 var configuration_1 = require("./config/configuration");
 Object.defineProperty(exports, "workspaceLayout", { enumerable: true, get: function () { return configuration_1.workspaceLayout; } });
+var error_types_1 = require("./project-graph/error-types");
+Object.defineProperty(exports, "AggregateCreateNodesError", { enumerable: true, get: function () { return error_types_1.AggregateCreateNodesError; } });
+var plugins_1 = require("./project-graph/plugins");
+Object.defineProperty(exports, "createNodesFromFiles", { enumerable: true, get: function () { return plugins_1.createNodesFromFiles; } });
 /**
  * @category Logger
  */
@@ -44,6 +48,7 @@ Object.defineProperty(exports, "getProjects", { enumerable: true, get: function
  */
 var glob_1 = require("./generators/utils/glob");
 Object.defineProperty(exports, "glob", { enumerable: true, get: function () { return glob_1.glob; } });
+Object.defineProperty(exports, "globAsync", { enumerable: true, get: function () { return glob_1.globAsync; } });
 /**
  * @category Generators
  */

package/src/generators/utils/glob.d.ts

@@ -7,5 +7,16 @@ import { Tree } from '../tree';
  * @param tree The file system tree
  * @param patterns A list of glob patterns
  * @returns Normalized paths in the workspace that match the provided glob patterns.
+ * @deprecated Use {@link globAsync} instead.
  */
 export declare function glob(tree: Tree, patterns: string[]): string[];
+/**
+ * Performs a tree-aware glob search on the files in a workspace. Able to find newly
+ * created files and hides deleted files before the updates are committed to disk.
+ * Paths should be unix-style with forward slashes.
+ *
+ * @param tree The file system tree
+ * @param patterns A list of glob patterns
+ * @returns Normalized paths in the workspace that match the provided glob patterns.
+ */
+export declare function globAsync(tree: Tree, patterns: string[]): Promise<string[]>;

package/src/generators/utils/glob.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.glob = void 0;
+exports.globAsync = exports.glob = void 0;
 const minimatch_1 = require("minimatch");
 const globs_1 = require("../../utils/globs");
 const workspace_context_1 = require("../../utils/workspace-context");
@@ -12,9 +12,27 @@ const workspace_context_1 = require("../../utils/workspace-context");
  * @param tree The file system tree
  * @param patterns A list of glob patterns
  * @returns Normalized paths in the workspace that match the provided glob patterns.
+ * @deprecated Use {@link globAsync} instead.
  */
 function glob(tree, patterns) {
-    const matches = new Set((0, workspace_context_1.globWithWorkspaceContext)(tree.root, patterns));
+    return combineGlobResultsWithTree(tree, patterns, (0, workspace_context_1.globWithWorkspaceContextSync)(tree.root, patterns));
+}
+exports.glob = glob;
+/**
+ * Performs a tree-aware glob search on the files in a workspace. Able to find newly
+ * created files and hides deleted files before the updates are committed to disk.
+ * Paths should be unix-style with forward slashes.
+ *
+ * @param tree The file system tree
+ * @param patterns A list of glob patterns
+ * @returns Normalized paths in the workspace that match the provided glob patterns.
+ */
+async function globAsync(tree, patterns) {
+    return combineGlobResultsWithTree(tree, patterns, await (0, workspace_context_1.globWithWorkspaceContext)(tree.root, patterns));
+}
+exports.globAsync = globAsync;
+function combineGlobResultsWithTree(tree, patterns, results) {
+    const matches = new Set(results);
     const combinedGlob = (0, globs_1.combineGlobPatterns)(patterns);
     const matcher = minimatch_1.minimatch.makeRe(combinedGlob);
     if (!matcher) {
@@ -32,4 +50,3 @@ function glob(tree, patterns) {
     }
     return Array.from(matches);
 }
-exports.glob = glob;

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

@@ -134,7 +134,7 @@ function readAndCombineAllProjectConfigurations(tree) {
         'project.json',
         ...(0, package_json_workspaces_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (p) => (0, json_1.readJson)(tree, p, { expectComments: true })),
     ];
-    const globbedFiles = (0, workspace_context_1.globWithWorkspaceContext)(tree.root, patterns);
+    const globbedFiles = (0, workspace_context_1.globWithWorkspaceContextSync)(tree.root, patterns);
     const createdFiles = findCreatedProjectFiles(tree, patterns);
     const deletedFiles = findDeletedProjectFiles(tree, patterns);
     const projectFiles = [...globbedFiles, ...createdFiles].filter((r) => deletedFiles.indexOf(r) === -1);

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

@@ -1,12 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildExplicitDependencies = void 0;
-const explicit_project_dependencies_1 = require("./explicit-project-dependencies");
 const explicit_package_json_dependencies_1 = require("./explicit-package-json-dependencies");
+const explicit_project_dependencies_1 = require("./explicit-project-dependencies");
+const target_project_locator_1 = require("./target-project-locator");
 function buildExplicitDependencies(jsPluginConfig, ctx) {
     if (totalNumberOfFilesToProcess(ctx) === 0)
         return [];
     let dependencies = [];
+    // TODO: TargetProjectLocator is a public API, so we can't change the shape of it
+    // We should eventually let it accept Record<string, ProjectConfiguration> s.t. we
+    // don't have to reshape the CreateDependenciesContext here.
+    const nodes = Object.fromEntries(Object.entries(ctx.projects).map(([key, config]) => [
+        key,
+        {
+            name: key,
+            type: null,
+            data: config,
+        },
+    ]));
+    const targetProjectLocator = new target_project_locator_1.TargetProjectLocator(nodes, ctx.externalNodes);
     if (jsPluginConfig.analyzeSourceFiles === undefined ||
         jsPluginConfig.analyzeSourceFiles === true) {
         let tsExists = false;
@@ -16,12 +29,12 @@ function buildExplicitDependencies(jsPluginConfig, ctx) {
         }
         catch { }
         if (tsExists) {
-            dependencies = dependencies.concat((0, explicit_project_dependencies_1.buildExplicitTypeScriptDependencies)(ctx));
+            dependencies = dependencies.concat((0, explicit_project_dependencies_1.buildExplicitTypeScriptDependencies)(ctx, targetProjectLocator));
         }
     }
     if (jsPluginConfig.analyzePackageJson === undefined ||
         jsPluginConfig.analyzePackageJson === true) {
-        dependencies = dependencies.concat((0, explicit_package_json_dependencies_1.buildExplicitPackageJsonDependencies)(ctx));
+        dependencies = dependencies.concat((0, explicit_package_json_dependencies_1.buildExplicitPackageJsonDependencies)(ctx, targetProjectLocator));
     }
     return dependencies;
 }

package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.d.ts

@@ -1,3 +1,4 @@
 import { CreateDependenciesContext } from '../../../../project-graph/plugins';
 import { RawProjectGraphDependency } from '../../../../project-graph/project-graph-builder';
-export declare function buildExplicitPackageJsonDependencies(ctx: CreateDependenciesContext): RawProjectGraphDependency[];
+import { TargetProjectLocator } from './target-project-locator';
+export declare function buildExplicitPackageJsonDependencies(ctx: CreateDependenciesContext, targetProjectLocator: TargetProjectLocator): RawProjectGraphDependency[];

package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildExplicitPackageJsonDependencies = void 0;
-const file_utils_1 = require("../../../../project-graph/file-utils");
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const project_graph_1 = require("../../../../config/project-graph");
-const json_1 = require("../../../../utils/json");
-const path_2 = require("../../../../utils/path");
+const file_utils_1 = require("../../../../project-graph/file-utils");
 const project_graph_builder_1 = require("../../../../project-graph/project-graph-builder");
-function buildExplicitPackageJsonDependencies(ctx) {
+const json_1 = require("../../../../utils/json");
+const path_1 = require("../../../../utils/path");
+function buildExplicitPackageJsonDependencies(ctx, targetProjectLocator) {
     const res = [];
     let packageNameMap = undefined;
     const nodes = Object.values(ctx.projects);
@@ -16,7 +16,7 @@ function buildExplicitPackageJsonDependencies(ctx) {
             if (isPackageJsonAtProjectRoot(nodes, f.file)) {
                 // we only create the package name map once and only if a package.json file changes
                 packageNameMap = packageNameMap || createPackageNameMap(ctx.projects);
-                processPackageJson(source, f.file, ctx, res, packageNameMap);
+                processPackageJson(source, f.file, ctx, targetProjectLocator, res, packageNameMap);
             }
         });
     });
@@ -27,7 +27,7 @@ function createPackageNameMap(projects) {
     const res = {};
     for (let projectName of Object.keys(projects)) {
         try {
-            const packageJson = (0, json_1.parseJson)((0, file_utils_1.defaultFileRead)((0, path_1.join)(projects[projectName].root, 'package.json')));
+            const packageJson = (0, json_1.parseJson)((0, file_utils_1.defaultFileRead)((0, node_path_1.join)(projects[projectName].root, 'package.json')));
             res[packageJson.name ?? projectName] = projectName;
         }
         catch (e) { }
@@ -36,13 +36,12 @@ function createPackageNameMap(projects) {
 }
 function isPackageJsonAtProjectRoot(nodes, fileName) {
     return (fileName.endsWith('package.json') &&
-        nodes.find((projectNode) => (0, path_2.joinPathFragments)(projectNode.root, 'package.json') === fileName));
+        nodes.find((projectNode) => (0, path_1.joinPathFragments)(projectNode.root, 'package.json') === fileName));
 }
-function processPackageJson(sourceProject, fileName, ctx, collectedDeps, packageNameMap) {
+function processPackageJson(sourceProject, fileName, ctx, targetProjectLocator, collectedDeps, packageNameMap) {
     try {
         const deps = readDeps((0, json_1.parseJson)((0, file_utils_1.defaultFileRead)(fileName)));
-        // the name matches the import path
-        deps.forEach((d) => {
+        for (const d of Object.keys(deps)) {
             // package.json refers to another project in the monorepo
             if (packageNameMap[d]) {
                 const dependency = {
@@ -53,30 +52,44 @@ function processPackageJson(sourceProject, fileName, ctx, collectedDeps, package
                 };
                 (0, project_graph_builder_1.validateDependency)(dependency, ctx);
                 collectedDeps.push(dependency);
+                continue;
             }
-            else if (ctx.externalNodes[`npm:${d}`]) {
-                const dependency = {
-                    source: sourceProject,
-                    target: `npm:${d}`,
-                    sourceFile: fileName,
-                    type: project_graph_1.DependencyType.static,
-                };
-                (0, project_graph_builder_1.validateDependency)(dependency, ctx);
-                collectedDeps.push(dependency);
+            const externalNodeName = targetProjectLocator.findNpmProjectFromImport(d, fileName);
+            if (!externalNodeName) {
+                continue;
             }
-        });
+            const dependency = {
+                source: sourceProject,
+                target: externalNodeName,
+                sourceFile: fileName,
+                type: project_graph_1.DependencyType.static,
+            };
+            (0, project_graph_builder_1.validateDependency)(dependency, ctx);
+            collectedDeps.push(dependency);
+        }
     }
     catch (e) {
         if (process.env.NX_VERBOSE_LOGGING === 'true') {
-            console.log(e);
+            console.error(e);
         }
     }
 }
 function readDeps(packageJson) {
-    return [
-        ...Object.keys(packageJson?.dependencies ?? {}),
-        ...Object.keys(packageJson?.devDependencies ?? {}),
-        ...Object.keys(packageJson?.peerDependencies ?? {}),
-        ...Object.keys(packageJson?.optionalDependencies ?? {}),
+    const deps = {};
+    /**
+     * We process dependencies in a rough order of increasing importance such that if a dependency is listed in multiple
+     * sections, the version listed under the "most important" one wins, with production dependencies being the most important.
+     */
+    const depType = [
+        'optionalDependencies',
+        'peerDependencies',
+        'devDependencies',
+        'dependencies',
     ];
+    for (const type of depType) {
+        for (const [depName, depVersion] of Object.entries(packageJson[type] || {})) {
+            deps[depName] = depVersion;
+        }
+    }
+    return deps;
 }

package/src/plugins/js/project-graph/build-dependencies/explicit-project-dependencies.d.ts

@@ -1,3 +1,4 @@
 import { CreateDependenciesContext } from '../../../../project-graph/plugins';
 import { RawProjectGraphDependency } from '../../../../project-graph/project-graph-builder';
-export declare function buildExplicitTypeScriptDependencies(ctx: CreateDependenciesContext): RawProjectGraphDependency[];
+import { TargetProjectLocator } from './target-project-locator';
+export declare function buildExplicitTypeScriptDependencies(ctx: CreateDependenciesContext, targetProjectLocator: TargetProjectLocator): RawProjectGraphDependency[];

package/src/plugins/js/project-graph/build-dependencies/explicit-project-dependencies.js

@@ -1,18 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildExplicitTypeScriptDependencies = void 0;
-const target_project_locator_1 = require("./target-project-locator");
-const project_graph_1 = require("../../../../config/project-graph");
 const path_1 = require("path");
-const workspace_root_1 = require("../../../../utils/workspace-root");
-const path_2 = require("../../../../utils/path");
+const project_graph_1 = require("../../../../config/project-graph");
 const project_graph_builder_1 = require("../../../../project-graph/project-graph-builder");
+const path_2 = require("../../../../utils/path");
+const workspace_root_1 = require("../../../../utils/workspace-root");
 function isRoot(projects, projectName) {
     return projects[projectName]?.root === '.';
 }
 function convertImportToDependency(importExpr, sourceFile, source, type, targetProjectLocator) {
-    const target = targetProjectLocator.findProjectWithImport(importExpr, sourceFile) ??
-        `npm:${importExpr}`;
+    const target = targetProjectLocator.findProjectFromImport(importExpr, sourceFile);
+    if (!target) {
+        return;
+    }
     return {
         source,
         target,
@@ -20,19 +21,7 @@ function convertImportToDependency(importExpr, sourceFile, source, type, targetP
         type,
     };
 }
-function buildExplicitTypeScriptDependencies(ctx) {
-    // TODO: TargetProjectLocator is a public API, so we can't change the shape of it
-    // We should eventually let it accept Record<string, ProjectConfiguration> s.t. we
-    // don't have to reshape the CreateDependenciesContext here.
-    const nodes = Object.fromEntries(Object.entries(ctx.projects).map(([key, config]) => [
-        key,
-        {
-            name: key,
-            type: null,
-            data: config,
-        },
-    ]));
-    const targetProjectLocator = new target_project_locator_1.TargetProjectLocator(nodes, ctx.externalNodes);
+function buildExplicitTypeScriptDependencies(ctx, targetProjectLocator) {
     const res = [];
     const filesToProcess = {};
     const moduleExtensions = [
@@ -63,6 +52,9 @@ function buildExplicitTypeScriptDependencies(ctx) {
         const normalizedFilePath = (0, path_2.normalizePath)((0, path_1.relative)(workspace_root_1.workspaceRoot, file));
         for (const importExpr of staticImportExpressions) {
             const dependency = convertImportToDependency(importExpr, normalizedFilePath, sourceProject, project_graph_1.DependencyType.static, targetProjectLocator);
+            if (!dependency) {
+                continue;
+            }
             // TODO: These edges technically should be allowed but we need to figure out how to separate config files out from root
             if (isRoot(ctx.projects, dependency.source) ||
                 !isRoot(ctx.projects, dependency.target)) {
@@ -71,6 +63,9 @@ function buildExplicitTypeScriptDependencies(ctx) {
         }
         for (const importExpr of dynamicImportExpressions) {
             const dependency = convertImportToDependency(importExpr, normalizedFilePath, sourceProject, project_graph_1.DependencyType.dynamic, targetProjectLocator);
+            if (!dependency) {
+                continue;
+            }
             // TODO: These edges technically should be allowed but we need to figure out how to separate config files out from root
             if (isRoot(ctx.projects, dependency.source) ||
                 !isRoot(ctx.projects, dependency.target)) {

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

@@ -1,21 +1,37 @@
 import { ProjectGraphExternalNode, ProjectGraphProjectNode } from '../../../../config/project-graph';
+/**
+ * The key is a combination of the package name and the workspace relative directory
+ * containing the file importing it e.g. `lodash__packages/my-lib`, the value is the
+ * resolved external node name from the project graph.
+ */
+type NpmResolutionCache = Map<string, string | null>;
+export declare function isBuiltinModuleImport(importExpr: string): boolean;
 export declare class TargetProjectLocator {
     private readonly nodes;
     private readonly externalNodes;
+    private readonly npmResolutionCache;
     private projectRootMappings;
     private npmProjects;
     private tsConfig;
     private paths;
     private typescriptResolutionCache;
-    private npmResolutionCache;
-    constructor(nodes: Record<string, ProjectGraphProjectNode>, externalNodes: Record<string, ProjectGraphExternalNode>);
+    constructor(nodes: Record<string, ProjectGraphProjectNode>, externalNodes?: Record<string, ProjectGraphExternalNode>, npmResolutionCache?: NpmResolutionCache);
     /**
-     * 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: string, filePath: string): string;
+    findProjectFromImport(importExpr: string, filePath: string): string;
+    /**
+     * Resolve any external project that matches the given import expression,
+     * relative to the given file path.
+     *
+     * @param importExpr
+     * @param projectRoot
+     */
+    findNpmProjectFromImport(importExpr: string, fromFilePath: string): string | null;
     /**
      * Return file paths matching the import relative to the repo root
      * @param normalizedImportExpr
@@ -24,9 +40,20 @@ export declare class TargetProjectLocator {
     findPaths(normalizedImportExpr: string): string[] | undefined;
     private resolveImportWithTypescript;
     private resolveImportWithRequire;
-    private findNpmPackage;
     private findProjectOfResolvedModule;
     private getAbsolutePath;
     private getRootTsConfig;
     private findMatchingProjectFiles;
+    /**
+     * 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.
+     */
+    private readPackageJson;
 }
+export {};