fix(core): fix pruning of pnpm lockfiles with github packages (#13875)

nrwl · Dec 19, 2022 · 20c4782 · 20c4782 · vercel · Dec 19, 2022
1 parent fed3f90
commit 20c4782
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/packages/nx/src/lock-file/lock-file.spec.ts b/packages/nx/src/lock-file/lock-file.spec.ts
@@ -1,7 +1,19 @@
 import { mapLockFileDataToPartialGraph } from './lock-file';
-import { parseNpmLockFile, stringifyNpmLockFile } from './npm';
-import { parsePnpmLockFile, stringifyPnpmLockFile } from './pnpm';
-import { parseYarnLockFile, stringifyYarnLockFile } from './yarn';
+import {
+  parseNpmLockFile,
+  pruneNpmLockFile,
+  stringifyNpmLockFile,
+} from './npm';
+import {
+  parsePnpmLockFile,
+  prunePnpmLockFile,
+  stringifyPnpmLockFile,
+} from './pnpm';
+import {
+  parseYarnLockFile,
+  pruneYarnLockFile,
+  stringifyYarnLockFile,
+} from './yarn';
 import {
   npmLockFileV1WithAliases,
   npmLockFileWithAliases,
@@ -247,6 +259,7 @@ describe('lock-file', () => {
       );
 
       const newPackage = createPackageJson('lib1', partialGraph, {});
+      const prunedLockFile = pruneYarnLockFile(lockFileData, newPackage);
       expect(newPackage).toMatchInlineSnapshot(`
         Object {
           "dependencies": Object {
@@ -283,6 +296,7 @@ describe('lock-file', () => {
       );
 
       const newPackage = createPackageJson('lib1', partialGraph, {});
+      const prunedLockFile = pruneNpmLockFile(lockFileData, newPackage);
       expect(newPackage).toMatchInlineSnapshot(`
         Object {
           "dependencies": Object {
@@ -317,6 +331,7 @@ describe('lock-file', () => {
       );
 
       const newPackage = createPackageJson('lib1', partialGraph, {});
+      const prunedLockFile = pruneYarnLockFile(lockFileData, newPackage);
       expect(newPackage).toMatchInlineSnapshot(`
         Object {
           "dependencies": Object {
@@ -350,6 +365,7 @@ describe('lock-file', () => {
         mapLockFileDataToPartialGraph(lockFileData, 'pnpm')
       );
       const newPackage = createPackageJson('lib1', partialGraph, {});
+      const prunedLockFile = prunePnpmLockFile(lockFileData, newPackage);
       expect(newPackage).toMatchInlineSnapshot(`
         Object {
           "dependencies": Object {

diff --git a/packages/nx/src/lock-file/pnpm.ts b/packages/nx/src/lock-file/pnpm.ts
@@ -432,7 +432,9 @@ function pruneDependencies(
         dependencies[packageName]
       ).find(([_, v]) => v.rootVersion);
       result[packageName] = result[packageName] || {};
-      const metaKey = `/${packageName}/${value.version}`;
+      const metaKey = value.actualVersion
+        ? value.version
+        : `/${packageName}/${value.version}`;
       const meta = packageMeta.find((m) => m.key.startsWith(metaKey));
 
       result[packageName][key] = Object.assign(value, {