nx 21.0.0-canary.20250206-8bd0bcd → 21.0.0-canary.20250418-8619c1d

package/src/native/index.js

@@ -1,5 +1,5 @@
 const { join, basename } = require('path');
-const { copyFileSync, existsSync, mkdirSync } = require('fs');
+const { copyFileSync, existsSync, mkdirSync, renameSync } = require('fs');
 const Module = require('module');
 const { nxVersion } = require('../utils/versions');
 const { getNativeFileCacheLocation } = require('./native-file-cache-location');
@@ -71,14 +71,28 @@ Module._load = function (request, parent, isMain) {
 
     // we copy the file to a workspace-scoped tmp directory and prefix with nxVersion to avoid stale files being loaded
     const nativeFileCacheLocation = getNativeFileCacheLocation();
+    // This is a path to copy to, not the one that gets loaded
+    const tmpTmpFile = join(
+      nativeFileCacheLocation,
+      nxVersion + '-' + Math.random() + fileName
+    );
+    // This is the path that will get loaded
     const tmpFile = join(nativeFileCacheLocation, nxVersion + '-' + fileName);
+
+    // If the file to be loaded already exists, just load it
     if (existsSync(tmpFile)) {
       return originalLoad.apply(this, [tmpFile, parent, isMain]);
     }
     if (!existsSync(nativeFileCacheLocation)) {
       mkdirSync(nativeFileCacheLocation, { recursive: true });
     }
-    copyFileSync(nativeLocation, tmpFile);
+    // First copy to a unique location for each process
+    copyFileSync(nativeLocation, tmpTmpFile);
+
+    // Then rename to the final location
+    renameSync(tmpTmpFile, tmpFile);
+
+    // Load from the final location
     return originalLoad.apply(this, [tmpFile, parent, isMain]);
   } else {
     // call the original _load function for everything else

package/src/native/native-bindings.js

@@ -361,12 +361,15 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
+module.exports.AppLifeCycle = nativeBinding.AppLifeCycle
 module.exports.ChildProcess = nativeBinding.ChildProcess
 module.exports.FileLock = nativeBinding.FileLock
 module.exports.HashPlanner = nativeBinding.HashPlanner
+module.exports.HttpRemoteCache = nativeBinding.HttpRemoteCache
 module.exports.ImportResult = nativeBinding.ImportResult
 module.exports.NxCache = nativeBinding.NxCache
 module.exports.NxTaskHistory = nativeBinding.NxTaskHistory
+module.exports.RunningTasksService = nativeBinding.RunningTasksService
 module.exports.RustPseudoTerminal = nativeBinding.RustPseudoTerminal
 module.exports.TaskDetails = nativeBinding.TaskDetails
 module.exports.TaskHasher = nativeBinding.TaskHasher
@@ -379,12 +382,15 @@ module.exports.EventType = nativeBinding.EventType
 module.exports.expandOutputs = nativeBinding.expandOutputs
 module.exports.findImports = nativeBinding.findImports
 module.exports.getBinaryTarget = nativeBinding.getBinaryTarget
+module.exports.getDefaultMaxCacheSize = nativeBinding.getDefaultMaxCacheSize
 module.exports.getFilesForOutputs = nativeBinding.getFilesForOutputs
 module.exports.getTransformableOutputs = nativeBinding.getTransformableOutputs
 module.exports.hashArray = nativeBinding.hashArray
 module.exports.hashFile = nativeBinding.hashFile
 module.exports.IS_WASM = nativeBinding.IS_WASM
 module.exports.remove = nativeBinding.remove
+module.exports.restoreTerminal = nativeBinding.restoreTerminal
+module.exports.TaskStatus = nativeBinding.TaskStatus
 module.exports.testOnlyTransferFileMap = nativeBinding.testOnlyTransferFileMap
 module.exports.transferProjectGraph = nativeBinding.transferProjectGraph
 module.exports.validateOutputs = nativeBinding.validateOutputs

package/src/native/nx.wasi-browser.js

@@ -76,25 +76,26 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__TaskHasher_impl_27']?.()
   __napiInstance.exports['__napi_register__Task_struct_28']?.()
   __napiInstance.exports['__napi_register__TaskTarget_struct_29']?.()
-  __napiInstance.exports['__napi_register__TaskGraph_struct_30']?.()
-  __napiInstance.exports['__napi_register__FileData_struct_31']?.()
-  __napiInstance.exports['__napi_register__InputsInput_struct_32']?.()
-  __napiInstance.exports['__napi_register__FileSetInput_struct_33']?.()
-  __napiInstance.exports['__napi_register__RuntimeInput_struct_34']?.()
-  __napiInstance.exports['__napi_register__EnvironmentInput_struct_35']?.()
-  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_36']?.()
-  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_37']?.()
-  __napiInstance.exports['__napi_register__NxJson_struct_38']?.()
-  __napiInstance.exports['__napi_register__FileLock_struct_39']?.()
-  __napiInstance.exports['__napi_register__FileLock_impl_41']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_42']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_51']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_52']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_53']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_54']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_55']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_56']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_57']?.()
+  __napiInstance.exports['__napi_register__TaskResult_struct_30']?.()
+  __napiInstance.exports['__napi_register__TaskGraph_struct_31']?.()
+  __napiInstance.exports['__napi_register__FileData_struct_32']?.()
+  __napiInstance.exports['__napi_register__InputsInput_struct_33']?.()
+  __napiInstance.exports['__napi_register__FileSetInput_struct_34']?.()
+  __napiInstance.exports['__napi_register__RuntimeInput_struct_35']?.()
+  __napiInstance.exports['__napi_register__EnvironmentInput_struct_36']?.()
+  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_37']?.()
+  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_38']?.()
+  __napiInstance.exports['__napi_register__NxJson_struct_39']?.()
+  __napiInstance.exports['__napi_register__FileLock_struct_40']?.()
+  __napiInstance.exports['__napi_register__FileLock_impl_42']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_struct_43']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_impl_54']?.()
+  __napiInstance.exports['__napi_register__WorkspaceErrors_55']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_56']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_57']?.()
+  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_58']?.()
+  __napiInstance.exports['__napi_register__FileMap_struct_59']?.()
+  __napiInstance.exports['__napi_register____test_only_transfer_file_map_60']?.()
 }
 export const FileLock = __napiModule.exports.FileLock
 export const HashPlanner = __napiModule.exports.HashPlanner

package/src/native/nx.wasi.cjs

@@ -107,25 +107,26 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__TaskHasher_impl_27']?.()
   __napiInstance.exports['__napi_register__Task_struct_28']?.()
   __napiInstance.exports['__napi_register__TaskTarget_struct_29']?.()
-  __napiInstance.exports['__napi_register__TaskGraph_struct_30']?.()
-  __napiInstance.exports['__napi_register__FileData_struct_31']?.()
-  __napiInstance.exports['__napi_register__InputsInput_struct_32']?.()
-  __napiInstance.exports['__napi_register__FileSetInput_struct_33']?.()
-  __napiInstance.exports['__napi_register__RuntimeInput_struct_34']?.()
-  __napiInstance.exports['__napi_register__EnvironmentInput_struct_35']?.()
-  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_36']?.()
-  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_37']?.()
-  __napiInstance.exports['__napi_register__NxJson_struct_38']?.()
-  __napiInstance.exports['__napi_register__FileLock_struct_39']?.()
-  __napiInstance.exports['__napi_register__FileLock_impl_41']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_42']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_51']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_52']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_53']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_54']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_55']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_56']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_57']?.()
+  __napiInstance.exports['__napi_register__TaskResult_struct_30']?.()
+  __napiInstance.exports['__napi_register__TaskGraph_struct_31']?.()
+  __napiInstance.exports['__napi_register__FileData_struct_32']?.()
+  __napiInstance.exports['__napi_register__InputsInput_struct_33']?.()
+  __napiInstance.exports['__napi_register__FileSetInput_struct_34']?.()
+  __napiInstance.exports['__napi_register__RuntimeInput_struct_35']?.()
+  __napiInstance.exports['__napi_register__EnvironmentInput_struct_36']?.()
+  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_37']?.()
+  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_38']?.()
+  __napiInstance.exports['__napi_register__NxJson_struct_39']?.()
+  __napiInstance.exports['__napi_register__FileLock_struct_40']?.()
+  __napiInstance.exports['__napi_register__FileLock_impl_42']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_struct_43']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_impl_54']?.()
+  __napiInstance.exports['__napi_register__WorkspaceErrors_55']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_56']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_57']?.()
+  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_58']?.()
+  __napiInstance.exports['__napi_register__FileMap_struct_59']?.()
+  __napiInstance.exports['__napi_register____test_only_transfer_file_map_60']?.()
 }
 module.exports.FileLock = __napiModule.exports.FileLock
 module.exports.HashPlanner = __napiModule.exports.HashPlanner

package/src/nx-cloud/nx-cloud-tasks-runner-shell.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxCloudTasksRunnerShell = void 0;
-const resolution_helpers_1 = require("./resolution-helpers");
-const update_manager_1 = require("./update-manager");
 const default_tasks_runner_1 = require("../tasks-runner/default-tasks-runner");
 const output_1 = require("../utils/output");
+const resolution_helpers_1 = require("./resolution-helpers");
+const update_manager_1 = require("./update-manager");
 const nxCloudTasksRunnerShell = async (tasks, options, context) => {
     try {
         const { nxCloudClient, version } = await (0, update_manager_1.verifyOrUpdateNxCloudClient)(options);
@@ -27,7 +27,7 @@ const nxCloudTasksRunnerShell = async (tasks, options, context) => {
         if (e instanceof update_manager_1.NxCloudEnterpriseOutdatedError) {
             output_1.output.warn({
                 title: e.message,
-                bodyLines: ['Nx Cloud will not used for this command.', ...body],
+                bodyLines: ['Nx Cloud will not be used for this command.', ...body],
             });
         }
         const results = await (0, default_tasks_runner_1.defaultTasksRunner)(tasks, options, context);

package/src/plugins/js/lock-file/lock-file.js

@@ -10,8 +10,10 @@ exports.getLockFileDependencies = getLockFileDependencies;
 exports.lockFileExists = lockFileExists;
 exports.getLockFileName = getLockFileName;
 exports.createLockFile = createLockFile;
-const fs_1 = require("fs");
-const path_1 = require("path");
+const node_child_process_1 = require("node:child_process");
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const semver_1 = require("semver");
 const package_manager_1 = require("../../../utils/package-manager");
 const workspace_root_1 = require("../../../utils/workspace-root");
 const output_1 = require("../../../utils/output");
@@ -25,23 +27,26 @@ const YARN_LOCK_FILE = 'yarn.lock';
 const NPM_LOCK_FILE = 'package-lock.json';
 const PNPM_LOCK_FILE = 'pnpm-lock.yaml';
 const BUN_LOCK_FILE = 'bun.lockb';
+const BUN_TEXT_LOCK_FILE = 'bun.lock';
 exports.LOCKFILES = [
     YARN_LOCK_FILE,
     NPM_LOCK_FILE,
     PNPM_LOCK_FILE,
     BUN_LOCK_FILE,
+    BUN_TEXT_LOCK_FILE,
 ];
-const YARN_LOCK_PATH = (0, path_1.join)(workspace_root_1.workspaceRoot, YARN_LOCK_FILE);
-const NPM_LOCK_PATH = (0, path_1.join)(workspace_root_1.workspaceRoot, NPM_LOCK_FILE);
-const PNPM_LOCK_PATH = (0, path_1.join)(workspace_root_1.workspaceRoot, PNPM_LOCK_FILE);
-const BUN_LOCK_PATH = (0, path_1.join)(workspace_root_1.workspaceRoot, BUN_LOCK_FILE);
+const YARN_LOCK_PATH = (0, node_path_1.join)(workspace_root_1.workspaceRoot, YARN_LOCK_FILE);
+const NPM_LOCK_PATH = (0, node_path_1.join)(workspace_root_1.workspaceRoot, NPM_LOCK_FILE);
+const PNPM_LOCK_PATH = (0, node_path_1.join)(workspace_root_1.workspaceRoot, PNPM_LOCK_FILE);
+const BUN_LOCK_PATH = (0, node_path_1.join)(workspace_root_1.workspaceRoot, BUN_LOCK_FILE);
+const BUN_TEXT_LOCK_PATH = (0, node_path_1.join)(workspace_root_1.workspaceRoot, BUN_TEXT_LOCK_FILE);
 /**
  * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}
  */
 function getLockFileNodes(packageManager, contents, lockFileHash, context) {
     try {
         if (packageManager === 'yarn') {
-            const packageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(context.workspaceRoot, 'package.json'));
+            const packageJson = (0, fileutils_1.readJsonFile)((0, node_path_1.join)(context.workspaceRoot, 'package.json'));
             return (0, yarn_parser_1.getYarnLockfileNodes)(contents, lockFileHash, packageJson);
         }
         if (packageManager === 'pnpm') {
@@ -99,16 +104,16 @@ function getLockFileDependencies(packageManager, contents, lockFileHash, context
 }
 function lockFileExists(packageManager) {
     if (packageManager === 'yarn') {
-        return (0, fs_1.existsSync)(YARN_LOCK_PATH);
+        return (0, node_fs_1.existsSync)(YARN_LOCK_PATH);
     }
     if (packageManager === 'pnpm') {
-        return (0, fs_1.existsSync)(PNPM_LOCK_PATH);
+        return (0, node_fs_1.existsSync)(PNPM_LOCK_PATH);
     }
     if (packageManager === 'npm') {
-        return (0, fs_1.existsSync)(NPM_LOCK_PATH);
+        return (0, node_fs_1.existsSync)(NPM_LOCK_PATH);
     }
     if (packageManager === 'bun') {
-        return (0, fs_1.existsSync)(BUN_LOCK_PATH);
+        return (0, node_fs_1.existsSync)(BUN_LOCK_PATH) || (0, node_fs_1.existsSync)(BUN_TEXT_LOCK_PATH);
     }
     throw new Error(`Unknown package manager ${packageManager} or lock file missing`);
 }
@@ -143,7 +148,17 @@ function getLockFilePath(packageManager) {
         return NPM_LOCK_PATH;
     }
     if (packageManager === 'bun') {
-        return BUN_LOCK_PATH;
+        try {
+            const bunVersion = (0, node_child_process_1.execSync)('bun --version').toString().trim();
+            // In version 1.2.0, bun switched to a text based lockfile format by default
+            if ((0, semver_1.gte)(bunVersion, '1.2.0')) {
+                return BUN_TEXT_LOCK_FILE;
+            }
+            return BUN_LOCK_PATH;
+        }
+        catch {
+            return BUN_LOCK_PATH;
+        }
     }
     throw new Error(`Unknown package manager: ${packageManager}`);
 }
@@ -157,7 +172,7 @@ function getLockFilePath(packageManager) {
  */
 function createLockFile(packageJson, graph, packageManager = (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot)) {
     const normalizedPackageJson = (0, package_json_1.normalizePackageJson)(packageJson);
-    const content = (0, fs_1.readFileSync)(getLockFilePath(packageManager), 'utf8');
+    const content = (0, node_fs_1.readFileSync)(getLockFilePath(packageManager), 'utf8');
     try {
         if (packageManager === 'yarn') {
             const prunedGraph = (0, project_graph_pruning_1.pruneProjectGraph)(graph, packageJson);

package/src/plugins/js/lock-file/utils/package-json.d.ts

@@ -3,7 +3,7 @@ import { PackageJson } from '../../../../utils/package-json';
  * Get version of hoisted package if available
  */
 export declare function getHoistedPackageVersion(packageName: string): string;
-export type NormalizedPackageJson = Pick<PackageJson, 'name' | 'version' | 'license' | 'dependencies' | 'devDependencies' | 'peerDependencies' | 'peerDependenciesMeta' | 'optionalDependencies' | 'packageManager'>;
+export type NormalizedPackageJson = Pick<PackageJson, 'name' | 'version' | 'license' | 'dependencies' | 'devDependencies' | 'peerDependencies' | 'peerDependenciesMeta' | 'optionalDependencies' | 'packageManager' | 'resolutions'>;
 /**
  * Strip off non-pruning related fields from package.json
  */

package/src/plugins/js/lock-file/utils/package-json.js

@@ -19,7 +19,7 @@ function getHoistedPackageVersion(packageName) {
  * Strip off non-pruning related fields from package.json
  */
 function normalizePackageJson(packageJson) {
-    const { name, version, license, dependencies, devDependencies, peerDependencies, peerDependenciesMeta, optionalDependencies, packageManager, } = packageJson;
+    const { name, version, license, dependencies, devDependencies, peerDependencies, peerDependenciesMeta, optionalDependencies, packageManager, resolutions, } = packageJson;
     return {
         name,
         version,
@@ -30,5 +30,6 @@ function normalizePackageJson(packageJson) {
         peerDependenciesMeta,
         optionalDependencies,
         packageManager,
+        resolutions,
     };
 }

package/src/plugins/js/lock-file/yarn-parser.js

@@ -29,14 +29,14 @@ function getYarnLockfileNodes(lockFileContent, lockFileHash, packageJson) {
     const isBerry = !!__metadata;
     // yarn classic splits keys when parsing so we need to stich them back together
     const groupedDependencies = groupDependencies(dependencies, isBerry);
-    return getNodes(groupedDependencies, packageJson, keyMap, isBerry);
+    return getNodes(groupedDependencies, packageJson, isBerry);
 }
 function getYarnLockfileDependencies(lockFileContent, lockFileHash, ctx) {
     const { __metadata, ...dependencies } = parseLockFile(lockFileContent, lockFileHash);
     const isBerry = !!__metadata;
     // yarn classic splits keys when parsing so we need to stich them back together
     const groupedDependencies = groupDependencies(dependencies, isBerry);
-    return getDependencies(groupedDependencies, keyMap, ctx);
+    return getDependencies(groupedDependencies, ctx);
 }
 function getPackageNameKeyPairs(keys) {
     const result = new Map();
@@ -51,7 +51,7 @@ function getPackageNameKeyPairs(keys) {
     });
     return result;
 }
-function getNodes(dependencies, packageJson, keyMap, isBerry) {
+function getNodes(dependencies, packageJson, isBerry) {
     const nodes = new Map();
     const combinedDeps = {
         ...packageJson.dependencies,
@@ -68,7 +68,7 @@ function getNodes(dependencies, packageJson, keyMap, isBerry) {
         nameKeyPairs.forEach((keySet, packageName) => {
             const keysArray = Array.from(keySet);
             // use key relevant to the package name
-            const version = findVersion(packageName, keysArray[0], snapshot, isBerry);
+            const [version, isAlias] = findVersion(packageName, keysArray[0], snapshot, isBerry);
             // use keys linked to the extracted package name
             keysArray.forEach((key) => {
                 // we don't need to keep duplicates, we can just track the keys
@@ -79,7 +79,7 @@ function getNodes(dependencies, packageJson, keyMap, isBerry) {
                 }
                 const node = {
                     type: 'npm',
-                    name: version
+                    name: version && !isAlias
                         ? `npm:${packageName}@${version}`
                         : `npm:${packageName}`,
                     data: {
@@ -151,7 +151,7 @@ function findVersion(packageName, key, snapshot, isBerry) {
         ? snapshot.resolution && !snapshot.resolution.startsWith(`${packageName}@`)
         : versionRange.startsWith('npm:');
     if (isAlias) {
-        return versionRange;
+        return [versionRange, true];
     }
     // check for berry tarball packages
     if (isBerry &&
@@ -159,13 +159,13 @@ function findVersion(packageName, key, snapshot, isBerry) {
         // different registry would yield suffix following '::' which we don't need
         snapshot.resolution.split('::')[0] !==
             `${packageName}@npm:${snapshot.version}`) {
-        return snapshot.resolution.slice(packageName.length + 1);
+        return [snapshot.resolution.slice(packageName.length + 1)];
     }
     if (!isBerry && isTarballPackage(versionRange, snapshot)) {
-        return snapshot.resolved;
+        return [snapshot.resolved];
     }
     // otherwise it's a standard version
-    return snapshot.version;
+    return [snapshot.version];
 }
 // check if snapshot represents tarball package
 function isTarballPackage(versionRange, snapshot) {
@@ -193,7 +193,7 @@ function getHoistedVersion(packageName) {
         return version;
     }
 }
-function getDependencies(dependencies, keyMap, ctx) {
+function getDependencies(dependencies, ctx) {
     const projectGraphDependencies = [];
     Object.keys(dependencies).forEach((keys) => {
         const snapshot = dependencies[keys];
@@ -203,8 +203,26 @@ function getDependencies(dependencies, keyMap, ctx) {
                 [snapshot.dependencies, snapshot.optionalDependencies].forEach((section) => {
                     if (section) {
                         Object.entries(section).forEach(([name, versionRange]) => {
-                            const target = keyMap.get(`${name}@npm:${versionRange}`) ||
+                            let target = keyMap.get(`${name}@npm:${versionRange}`) ||
                                 keyMap.get(`${name}@${versionRange}`);
+                            if (!target) {
+                                const shortRange = versionRange.replace(/^npm:/, '');
+                                // for range like 'npm:*' the above will not be a match
+                                if (shortRange === '*') {
+                                    const foundKey = Array.from(keyMap.keys()).find((k) => k.startsWith(`${name}@`));
+                                    if (foundKey) {
+                                        target = keyMap.get(foundKey);
+                                    }
+                                }
+                                else if (shortRange.includes('||')) {
+                                    // when range is a union of ranges, we need to treat it as an array
+                                    const ranges = shortRange.split('||').map((r) => r.trim());
+                                    target = Object.values(keyMap).find((n) => {
+                                        return (n.data.packageName === name &&
+                                            ranges.some((r) => (0, semver_1.satisfies)(n.data.version, r)));
+                                    })?.[1];
+                                }
+                            }
                             if (target) {
                                 const dep = {
                                     source: node.name,
@@ -271,11 +289,11 @@ function addPackageVersion(packageName, version, collection, isBerry) {
         collection.set(packageName, new Set());
     }
     collection.get(packageName).add(`${packageName}@${version}`);
-    if (isBerry && !version.startsWith('npm:')) {
+    if (isBerry && !version.startsWith('npm:') && !version.startsWith('patch:')) {
         collection.get(packageName).add(`${packageName}@npm:${version}`);
     }
 }
-function mapSnapshots(dependencies, nodes, packageJson, isBerry) {
+function mapSnapshots(rootDependencies, nodes, packageJson, isBerry) {
     // map snapshot to set of keys (e.g. `eslint@^7.0.0, eslint@npm:^7.0.0`)
     const snapshotMap = new Map();
     // track all existing dependencies's keys
@@ -286,8 +304,11 @@ function mapSnapshots(dependencies, nodes, packageJson, isBerry) {
         ...packageJson.optionalDependencies,
         ...packageJson.peerDependencies,
     };
+    const resolutions = {
+        ...packageJson.resolutions,
+    };
     // yarn classic splits keys when parsing so we need to stich them back together
-    const groupedDependencies = groupDependencies(dependencies, isBerry);
+    const groupedDependencies = groupDependencies(rootDependencies, isBerry);
     // collect snapshots and their matching keys
     Object.values(nodes).forEach((node) => {
         const foundOriginalKeys = findOriginalKeys(groupedDependencies, node);
@@ -311,9 +332,19 @@ function mapSnapshots(dependencies, nodes, packageJson, isBerry) {
                 snapshotMap.get(snapshot).add(requestedKey);
             }
         }
+        const requestedResolutionsVersion = getPackageJsonVersion(resolutions, node);
+        if (requestedResolutionsVersion) {
+            addPackageVersion(node.data.packageName, requestedResolutionsVersion, existingKeys, isBerry);
+            const requestedKey = isBerry
+                ? reverseMapBerryKey(node, requestedResolutionsVersion, snapshot)
+                : `${node.data.packageName}@${requestedResolutionsVersion}`;
+            if (!snapshotMap.get(snapshot).has(requestedKey)) {
+                snapshotMap.get(snapshot).add(requestedKey);
+            }
+        }
         if (isBerry) {
             // look for patched versions
-            const patch = findPatchedKeys(groupedDependencies, node);
+            const patch = findPatchedKeys(groupedDependencies, node, resolutions[node.data.packageName]);
             if (patch) {
                 const [matchedKeys, snapshot] = patch;
                 snapshotMap.set(snapshot, new Set(matchedKeys));
@@ -321,7 +352,7 @@ function mapSnapshots(dependencies, nodes, packageJson, isBerry) {
         }
     });
     // remove keys that match version ranges that have been pruned away
-    snapshotMap.forEach((snapshotValue, snapshotKey) => {
+    snapshotMap.forEach((snapshotValue, snapshot) => {
         for (const key of snapshotValue.values()) {
             const packageName = key.slice(0, key.indexOf('@', 1));
             let normalizedKey = key;
@@ -353,8 +384,8 @@ function mapSnapshots(dependencies, nodes, packageJson, isBerry) {
 }
 function reverseMapBerryKey(node, version, snapshot) {
     // alias packages already have version
-    if (version.startsWith('npm:')) {
-        `${node.data.packageName}@${version}`;
+    if (version.startsWith('npm:') || version.startsWith('patch:')) {
+        return `${node.data.packageName}@${version}`;
     }
     // check for berry tarball packages
     if (snapshot.resolution &&
@@ -363,15 +394,28 @@ function reverseMapBerryKey(node, version, snapshot) {
     }
     return `${node.data.packageName}@npm:${version}`;
 }
-function getPackageJsonVersion(combinedDependencies, node) {
+function getPackageJsonVersion(dependencies, node) {
     const { packageName, version } = node.data;
-    if (combinedDependencies[packageName]) {
-        if (combinedDependencies[packageName] === version ||
-            (0, semver_1.satisfies)(version, combinedDependencies[packageName])) {
-            return combinedDependencies[packageName];
+    if (dependencies[packageName]) {
+        const patchRegex = new RegExp(`^patch:${packageName}@(.*)|#.*$`);
+        // extract the version from the patch or use the full version
+        const versionRange = dependencies[packageName].match(patchRegex)?.[1] ||
+            dependencies[packageName];
+        if (versionRange === version || (0, semver_1.satisfies)(version, versionRange)) {
+            return dependencies[packageName];
         }
     }
 }
+function isStandardPackage(snapshot, version) {
+    return snapshot.version === version;
+}
+function isBerryAlias(snapshot, version) {
+    return snapshot.resolution && `npm:${snapshot.resolution}` === version;
+}
+function isClassicAlias(node, keys) {
+    return (node.data.version.startsWith('npm:') &&
+        keys.some((k) => k === `${node.data.packageName}@${node.data.version}`));
+}
 function findOriginalKeys(dependencies, node) {
     for (const keyExpr of Object.keys(dependencies)) {
         const snapshot = dependencies[keyExpr];
@@ -379,18 +423,9 @@ function findOriginalKeys(dependencies, node) {
         if (!keys.some((k) => k.startsWith(`${node.data.packageName}@`))) {
             continue;
         }
-        // standard package
-        if (snapshot.version === node.data.version) {
-            return [keys, snapshot];
-        }
-        // berry alias package
-        if (snapshot.resolution &&
-            `npm:${snapshot.resolution}` === node.data.version) {
-            return [keys, snapshot];
-        }
-        // classic alias
-        if (node.data.version.startsWith('npm:') &&
-            keys.some((k) => k === `${node.data.packageName}@${node.data.version}`)) {
+        if (isStandardPackage(snapshot, node.data.version) ||
+            isBerryAlias(snapshot, node.data.version) ||
+            isClassicAlias(node, keys)) {
             return [keys, snapshot];
         }
         // tarball package
@@ -400,16 +435,27 @@ function findOriginalKeys(dependencies, node) {
         }
     }
 }
-function findPatchedKeys(dependencies, node) {
+function findPatchedKeys(dependencies, node, resolutionVersion) {
     for (const keyExpr of Object.keys(dependencies)) {
         const snapshot = dependencies[keyExpr];
         const keys = keyExpr.split(', ');
         if (!keys[0].startsWith(`${node.data.packageName}@patch:`)) {
             continue;
         }
-        // local patches are currently not supported
-        if (keys[0].includes('.yarn/patches')) {
-            continue;
+        if (keyExpr.includes('.yarn/patches')) {
+            if (!resolutionVersion) {
+                continue;
+            }
+            const key = `${node.data.packageName}@${resolutionVersion}`;
+            // local patches can have different location from than the root lock file
+            // use the one from local package.json as the source of truth as long as the rest of the patch matches
+            // this obviously doesn't cover the case of patch over a patch, but that's a super rare case and one can argue one can just join those two patches
+            if (key.split('::locator')[0] !== keyExpr.split('::locator')[0]) {
+                continue;
+            }
+            else {
+                return [[key], { ...snapshot, resolution: key }];
+            }
         }
         if (snapshot.version === node.data.version) {
             return [keys, snapshot];

package/src/plugins/js/project-graph/affected/lock-file-changes.js

@@ -19,6 +19,7 @@ const getTouchedProjectsFromLockFile = (fileChanges, projectGraphNodes) => {
         'pnpm-lock.yaml',
         'pnpm-lock.yml',
         'bun.lockb',
+        'bun.lock',
     ];
     if (fileChanges.some((f) => lockFiles.includes(f.file))) {
         return Object.values(projectGraphNodes).map((p) => p.name);

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

@@ -38,7 +38,7 @@ function buildExplicitTypeScriptDependencies(ctx, targetProjectLocator) {
     if (isVuePluginInstalled()) {
         moduleExtensions.push('.vue');
     }
-    for (const [project, fileData] of Object.entries(ctx.fileMap.projectFileMap)) {
+    for (const [project, fileData] of Object.entries(ctx.filesToProcess.projectFileMap)) {
         filesToProcess[project] ??= [];
         for (const { file } of fileData) {
             if (moduleExtensions.some((ext) => file.endsWith(ext))) {

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

@@ -5,6 +5,11 @@ import type { ProjectGraphExternalNode, ProjectGraphProjectNode } from '../../..
  * resolved external node name from the project graph.
  */
 type NpmResolutionCache = Map<string, string | null>;
+type PathPattern = {
+    pattern: string;
+    prefix: string;
+    suffix: string;
+};
 export declare function isBuiltinModuleImport(importExpr: string): boolean;
 export declare class TargetProjectLocator {
     private readonly nodes;
@@ -14,6 +19,7 @@ export declare class TargetProjectLocator {
     private npmProjects;
     private tsConfig;
     private paths;
+    private parsedPathPatterns;
     private typescriptResolutionCache;
     private packagesMetadata;
     constructor(nodes: Record<string, ProjectGraphProjectNode>, externalNodes?: Record<string, ProjectGraphExternalNode>, npmResolutionCache?: NpmResolutionCache);
@@ -36,11 +42,14 @@ export declare class TargetProjectLocator {
     /**
      * Return file paths matching the import relative to the repo root
      * @param normalizedImportExpr
-     * @returns
+     * @deprecated Use `findMatchingPaths` instead. It will be removed in Nx v22.
      */
     findPaths(normalizedImportExpr: string): string[] | undefined;
+    findMatchingPaths(importExpr: string): [pattern: string | PathPattern, paths: string[]] | undefined;
     findImportInWorkspaceProjects(importPath: string): string | null;
     findDependencyInWorkspaceProjects(dep: string): string | null;
+    private isPatternMatch;
+    private parsePaths;
     private resolveImportWithTypescript;
     private resolveImportWithRequire;
     private findProjectOfResolvedModule;