nx 21.3.0-canary.20250624-0ef8857 → 21.3.0-canary.20250626-8b6ad42

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

@@ -9,6 +9,7 @@ const semver_1 = require("semver");
 const project_graph_1 = require("../../../config/project-graph");
 const file_hasher_1 = require("../../../hasher/file-hasher");
 const object_sort_1 = require("../../../utils/object-sort");
+const get_workspace_packages_from_graph_1 = require("../utils/get-workspace-packages-from-graph");
 let currentLockFileHash;
 let cachedParsedLockFile;
 // we use key => node map to avoid duplicate work when parsing keys
@@ -244,7 +245,8 @@ function stringifyYarnLockfile(graph, rootLockFileContent, packageJson) {
     const { parseSyml, stringifySyml } = require('@yarnpkg/parsers');
     const { __metadata, ...dependencies } = parseSyml(rootLockFileContent);
     const isBerry = !!__metadata;
-    const snapshots = mapSnapshots(dependencies, graph.externalNodes, packageJson, isBerry);
+    const workspaceModules = (0, get_workspace_packages_from_graph_1.getWorkspacePackagesFromGraph)(graph);
+    const snapshots = mapSnapshots(dependencies, graph.externalNodes, packageJson, workspaceModules, isBerry);
     if (isBerry) {
         // add root workspace package
         const workspacePackage = generateRootWorkspacePackage(packageJson);
@@ -293,7 +295,7 @@ function addPackageVersion(packageName, version, collection, isBerry) {
         collection.get(packageName).add(`${packageName}@npm:${version}`);
     }
 }
-function mapSnapshots(rootDependencies, nodes, packageJson, isBerry) {
+function mapSnapshots(rootDependencies, nodes, packageJson, workspaceModules, 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
@@ -311,7 +313,7 @@ function mapSnapshots(rootDependencies, nodes, packageJson, isBerry) {
     const groupedDependencies = groupDependencies(rootDependencies, isBerry);
     // collect snapshots and their matching keys
     Object.values(nodes).forEach((node) => {
-        const foundOriginalKeys = findOriginalKeys(groupedDependencies, node);
+        const foundOriginalKeys = findOriginalKeys(groupedDependencies, node, workspaceModules);
         if (!foundOriginalKeys) {
             throw new Error(`Original key(s) not found for "${node.data.packageName}@${node.data.version}" while pruning yarn.lock.`);
         }
@@ -322,7 +324,7 @@ function mapSnapshots(rootDependencies, nodes, packageJson, isBerry) {
             Object.entries(section || {}).forEach(([name, versionSpec]) => addPackageVersion(name, versionSpec, existingKeys, isBerry));
         });
         // add package.json requested version to keys
-        const requestedVersion = getPackageJsonVersion(combinedDependencies, node);
+        const requestedVersion = getPackageJsonVersion(combinedDependencies, node, workspaceModules);
         if (requestedVersion) {
             addPackageVersion(node.data.packageName, requestedVersion, existingKeys, isBerry);
             const requestedKey = isBerry
@@ -332,7 +334,7 @@ function mapSnapshots(rootDependencies, nodes, packageJson, isBerry) {
                 snapshotMap.get(snapshot).add(requestedKey);
             }
         }
-        const requestedResolutionsVersion = getPackageJsonVersion(resolutions, node);
+        const requestedResolutionsVersion = getPackageJsonVersion(resolutions, node, workspaceModules);
         if (requestedResolutionsVersion) {
             addPackageVersion(node.data.packageName, requestedResolutionsVersion, existingKeys, isBerry);
             const requestedKey = isBerry
@@ -394,8 +396,11 @@ function reverseMapBerryKey(node, version, snapshot) {
     }
     return `${node.data.packageName}@npm:${version}`;
 }
-function getPackageJsonVersion(dependencies, node) {
+function getPackageJsonVersion(dependencies, node, workspaceModules) {
     const { packageName, version } = node.data;
+    if (workspaceModules.has(packageName)) {
+        return `file:./workspace_modules/${packageName}`;
+    }
     if (dependencies[packageName]) {
         const patchRegex = new RegExp(`^patch:${packageName}@(.*)|#.*$`);
         // extract the version from the patch or use the full version
@@ -416,13 +421,20 @@ function isClassicAlias(node, keys) {
     return (node.data.version.startsWith('npm:') &&
         keys.some((k) => k === `${node.data.packageName}@${node.data.version}`));
 }
-function findOriginalKeys(dependencies, node) {
+function findOriginalKeys(dependencies, node, workspaceModules) {
     for (const keyExpr of Object.keys(dependencies)) {
         const snapshot = dependencies[keyExpr];
         const keys = keyExpr.split(', ');
         if (!keys.some((k) => k.startsWith(`${node.data.packageName}@`))) {
             continue;
         }
+        if (keys.some((k) => workspaceModules.has(k) || workspaceModules.has(k.split('@file:')[0]))) {
+            const packageName = keys[0].split('@file:')[0];
+            return [
+                [`${packageName}@file:./workspace_modules/${packageName}`],
+                snapshot,
+            ];
+        }
         if (isStandardPackage(snapshot, node.data.version) ||
             isBerryAlias(snapshot, node.data.version) ||
             isClassicAlias(node, keys)) {

package/src/plugins/js/utils/get-workspace-packages-from-graph.d.ts

@@ -0,0 +1,2 @@
+import { type ProjectGraph, ProjectGraphProjectNode } from '../../../config/project-graph';
+export declare function getWorkspacePackagesFromGraph(graph: ProjectGraph): Map<string, ProjectGraphProjectNode>;

package/src/plugins/js/utils/get-workspace-packages-from-graph.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWorkspacePackagesFromGraph = getWorkspacePackagesFromGraph;
+function getWorkspacePackagesFromGraph(graph) {
+    const workspacePackages = new Map();
+    for (const [projectName, project] of Object.entries(graph.nodes)) {
+        const pkgName = project.data?.metadata?.js?.packageName;
+        if (pkgName) {
+            workspacePackages.set(pkgName, project);
+        }
+    }
+    return workspacePackages;
+}