nx 22.3.0-canary.20251215-e864b6a → 22.3.0-canary.20251216-71bfc21

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

@@ -13,6 +13,7 @@ const catalog_1 = require("../../../utils/catalog");
 const project_graph_pruning_1 = require("./project-graph-pruning");
 const path_1 = require("path");
 const get_workspace_packages_from_graph_1 = require("../utils/get-workspace-packages-from-graph");
+const semver_1 = require("semver");
 let currentLockFileHash;
 let parsedLockFile;
 function parsePnpmLockFile(lockFileContent, lockFileHash) {
@@ -63,18 +64,79 @@ function matchedDependencyName(importer, key, originalPackageName) {
         matchPropValue(importer.optionalDependencies, key, originalPackageName, 'optionalDependencies') ||
         matchPropValue(importer.peerDependencies, key, originalPackageName, 'peerDependencies'));
 }
-function createHashFromSnapshot(snapshot) {
-    return (snapshot.resolution?.['integrity'] ||
+function createHashFromSnapshot(snapshot, patchHash) {
+    const baseHash = snapshot.resolution?.['integrity'] ||
         (snapshot.resolution?.['tarball']
             ? (0, file_hasher_1.hashArray)([snapshot.resolution['tarball']])
-            : undefined));
+            : undefined);
+    // If there's a patch hash, combine it with the base hash
+    if (patchHash && baseHash) {
+        return (0, file_hasher_1.hashArray)([baseHash, patchHash]);
+    }
+    return baseHash ?? patchHash;
 }
 function isAliasVersion(depVersion) {
     return depVersion.startsWith('/') || depVersion.includes('@');
 }
+/**
+ * Finds the appropriate patch hash for a package based on its name and version.
+ * Follows PNPM's priority order (https://pnpm.io/settings#patcheddependencies):
+ * 1. Exact version match (e.g., "vitest@3.2.4") - highest priority
+ * 2. Version range match (e.g., "vitest@^3.0.0")
+ * 3. Name-only match (e.g., "vitest") - lowest priority
+ */
+function findPatchHash(patchEntriesByPackage, packageName, version) {
+    const entries = patchEntriesByPackage.get(packageName);
+    if (!entries) {
+        return undefined; // No patches for this package
+    }
+    // Check for exact version match first (highest priority)
+    const exactMatch = entries.find((entry) => entry.versionSpecifier === version);
+    if (exactMatch) {
+        return exactMatch.hash;
+    }
+    // Check for version range matches
+    for (const entry of entries) {
+        // Skip name-only entries (will be handled at the end with lowest priority)
+        if (entry.versionSpecifier === null) {
+            continue;
+        }
+        if ((0, semver_1.validRange)(entry.versionSpecifier)) {
+            try {
+                if ((0, semver_1.satisfies)(version, entry.versionSpecifier)) {
+                    return entry.hash;
+                }
+            }
+            catch {
+                // Invalid semver range, skip
+            }
+        }
+    }
+    // Fall back to name-only match (lowest priority)
+    const nameOnlyMatch = entries.find((entry) => entry.versionSpecifier === null);
+    return nameOnlyMatch?.hash;
+}
 function getNodes(data, isV5) {
     const keyMap = new Map();
     const nodes = new Map();
+    // Extract and pre-parse patch information from patchedDependencies section
+    const patchEntriesByPackage = new Map();
+    if (data.patchedDependencies) {
+        for (const specifier of Object.keys(data.patchedDependencies)) {
+            const patchInfo = data.patchedDependencies[specifier];
+            if (patchInfo && typeof patchInfo === 'object' && 'hash' in patchInfo) {
+                const packageName = extractNameFromKey(specifier, false);
+                const versionSpecifier = getVersion(specifier, packageName) || null;
+                if (!patchEntriesByPackage.has(packageName)) {
+                    patchEntriesByPackage.set(packageName, []);
+                }
+                patchEntriesByPackage.get(packageName).push({
+                    versionSpecifier,
+                    hash: patchInfo.hash,
+                });
+            }
+        }
+    }
     const maybeAliasedPackageVersions = new Map(); // <version, alias>
     if (data.importers['.'].optionalDependencies) {
         for (const [depName, depVersion] of Object.entries(data.importers['.'].optionalDependencies)) {
@@ -104,7 +166,14 @@ function getNodes(data, isV5) {
         if (!originalPackageName) {
             continue;
         }
-        const hash = createHashFromSnapshot(snapshot);
+        // Extract version from the key to match against patch specifiers
+        const versionFromKey = getVersion(key, originalPackageName);
+        // Parse the base version (without peer dependency info, etc.)
+        const baseVersion = parseBaseVersion(versionFromKey, isV5);
+        // Find the appropriate patch hash using PNPM's priority order:
+        // 1. Exact version match, 2. Version range match, 3. Name-only match
+        const patchHash = findPatchHash(patchEntriesByPackage, originalPackageName, baseVersion);
+        const hash = createHashFromSnapshot(snapshot, patchHash);
         // snapshot already has a name
         if (snapshot.name) {
             packageNameObj = {
@@ -122,14 +191,14 @@ function getNodes(data, isV5) {
             packageNameObj = {
                 key,
                 packageName: rootDependencyName,
-                hash: createHashFromSnapshot(snapshot),
+                hash,
             };
         }
         if (!snapshot.name && !rootDependencyName) {
             packageNameObj = {
                 key,
                 packageName: originalPackageName,
-                hash: createHashFromSnapshot(snapshot),
+                hash,
             };
         }
         if (snapshot.peerDependencies) {
@@ -512,23 +581,17 @@ function getVersion(key, packageName) {
     return key.slice(packageName.length + 1);
 }
 function extractNameFromKey(key, isV5) {
-    // if package name contains org e.g. "@babel/runtime@7.12.5"
+    const versionSeparator = isV5 ? '/' : '@';
     if (key.startsWith('@')) {
-        if (isV5) {
-            const startFrom = key.indexOf('/');
-            return key.slice(0, key.indexOf('/', startFrom + 1));
-        }
-        else {
-            // find the position of the '@'
-            return key.slice(0, key.indexOf('@', 1));
-        }
-    }
-    if (isV5) {
-        // if package has just a name e.g. "react/7.12.5..."
-        return key.slice(0, key.indexOf('/', 1));
+        // Scoped package (e.g., "@babel/core@7.12.5" or "@babel/core/7.12.5")
+        // Find the end of scope, then look for the first version separator after that
+        const scopeEnd = key.indexOf('/');
+        const sepIndex = scopeEnd === -1 ? -1 : key.indexOf(versionSeparator, scopeEnd + 1);
+        return sepIndex === -1 ? key : key.slice(0, sepIndex);
     }
     else {
-        // if package has just a name e.g. "react@7.12.5..."
-        return key.slice(0, key.indexOf('@', 1));
+        // Non-scoped package (e.g., "react@7.12.5" or "react/7.12.5")
+        const sepIndex = key.indexOf(versionSeparator);
+        return sepIndex === -1 ? key : key.slice(0, sepIndex);
     }
 }

package/src/plugins/js/project-graph/affected/npm-packages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"npm-packages.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/affected/npm-packages.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAChB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAGL,UAAU,EACX,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kEAAkE,CAAC;AAQzG,eAAO,MAAM,qBAAqB,EAAE,qBAAqB,CACvD,eAAe,GAAG,UAAU,CAoE7B,CAAC"}
+{"version":3,"file":"npm-packages.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/affected/npm-packages.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAChB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAGL,UAAU,EACX,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kEAAkE,CAAC;AAQzG,eAAO,MAAM,qBAAqB,EAAE,qBAAqB,CACvD,eAAe,GAAG,UAAU,CAmG7B,CAAC"}

package/src/plugins/js/project-graph/affected/npm-packages.js

@@ -49,6 +49,31 @@ const getTouchedNpmPackages = (touchedFiles, _, nxJson, packageJson, projectGrap
                 }
             }
         }
+        else if ((0, json_diff_1.isJsonChange)(c) &&
+            (c.path[0] === 'overrides' ||
+                c.path[0] === 'resolutions' ||
+                (c.path[0] === 'pnpm' && c.path[1] === 'overrides'))) {
+            // Changes to overrides, resolutions, or pnpm.overrides
+            // Find which package was changed and mark projects that depend on it as affected
+            const packageName = c.path[0] === 'pnpm' ? c.path[2] : c.path[1];
+            if (packageName) {
+                // Look for the npm package in external nodes
+                let npmPackage = npmPackages.find((pkg) => pkg.data.packageName === packageName);
+                if (npmPackage) {
+                    touched.push(npmPackage.name);
+                    // If it's a global package, all projects are affected
+                    if ('packageName' in npmPackage.data &&
+                        globalPackages.has(npmPackage.data.packageName)) {
+                        return Object.keys(projectGraph.nodes);
+                    }
+                }
+                else {
+                    // If the package isn't found in external nodes, it might affect all projects
+                    // since overrides can affect transitive dependencies
+                    return Object.keys(projectGraph.nodes);
+                }
+            }
+        }
         else if ((0, file_utils_1.isWholeFileChange)(c)) {
             // Whole file was touched, so all npm packages are touched.
             touched = npmPackages.map((pkg) => pkg.name);

package/src/tasks-runner/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/cache.ts"],"names":[],"mappings":"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"}

package/src/tasks-runner/cache.js

@@ -56,7 +56,7 @@ class DbCache {
     constructor(options) {
         this.options = options;
         this.nxJson = (0, nx_json_1.readNxJson)();
-        this.cache = new native_1.NxCache(workspace_root_1.workspaceRoot, cache_directory_1.cacheDir, (0, db_connection_1.getDbConnection)(), resolveMaxCacheSize(this.nxJson));
+        this.cache = new native_1.NxCache(workspace_root_1.workspaceRoot, cache_directory_1.cacheDir, (0, db_connection_1.getDbConnection)(), undefined, resolveMaxCacheSize(this.nxJson));
         this.isVerbose = process.env.NX_VERBOSE_LOGGING === 'true';
     }
     async init() {