fix(core): fix lock file mapping for yarn berry (#13026)

nrwl · Nov 7, 2022 · 383107c · 383107c · vercel · Nov 7, 2022
1 parent 2f20807
commit 383107c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/packages/nx/src/utils/lock-file/npm.ts b/packages/nx/src/utils/lock-file/npm.ts
@@ -378,7 +378,7 @@ export function transitiveDependencyNpmLookup(
   parentPackage: string,
   versions: PackageVersions,
   version: string
-): string {
+): PackageDependency {
   const nestedVersion = Object.values(versions).find((v) =>
     v.packageMeta.some(
       (p) =>
@@ -387,11 +387,11 @@ export function transitiveDependencyNpmLookup(
   );
 
   if (nestedVersion) {
-    return nestedVersion.version;
+    return nestedVersion;
   }
 
   // otherwise search for the matching version
-  return Object.values(versions).find((v) => v.rootVersion)?.version;
+  return Object.values(versions).find((v) => v.rootVersion);
 }
 
 /**

diff --git a/packages/nx/src/utils/lock-file/pnpm.ts b/packages/nx/src/utils/lock-file/pnpm.ts
@@ -281,10 +281,9 @@ export function transitiveDependencyPnpmLookup(
   parentPackage: string,
   versions: PackageVersions,
   version: string
-): string {
+): PackageDependency {
   // pnpm's dependencies always point to the exact version so this block is only for insurrance
-  return Object.values(versions).find((v) => satisfies(v.version, version))
-    ?.version;
+  return Object.values(versions).find((v) => satisfies(v.version, version));
 }
 
 /**

diff --git a/packages/nx/src/utils/lock-file/utils.ts b/packages/nx/src/utils/lock-file/utils.ts
@@ -1,6 +1,10 @@
 import { satisfies } from 'semver';
 import { defaultHashing } from '../../hasher/hashing-impl';
-import { LockFileData, PackageVersions } from './lock-file-type';
+import {
+  LockFileData,
+  PackageDependency,
+  PackageVersions,
+} from './lock-file-type';
 import { workspaceRoot } from '../workspace-root';
 import { existsSync, readFileSync } from 'fs';
 import {
@@ -84,7 +88,7 @@ type TransitiveLookupFunction = (
   parentPackage: string,
   versions: PackageVersions,
   version: string
-) => string;
+) => PackageDependency;
 
 export function mapExternalNodes(
   lockFileData: LockFileData,
@@ -182,7 +186,7 @@ function mapTransitiveDependencies(
             parentPackage,
             packages[packageName],
             cleanVersion
-          );
+          )?.version;
       // for some peer dependencies, we won't find installed version so we'll just ignore these
       if (version) {
         const nodeName = getNodeName(

diff --git a/packages/nx/src/utils/lock-file/yarn.ts b/packages/nx/src/utils/lock-file/yarn.ts
@@ -160,10 +160,14 @@ export function transitiveDependencyYarnLookup(
   parentPackage: string,
   versions: PackageVersions,
   version: string
-): string {
+): PackageDependency {
   return Object.values(versions).find((v) =>
-    v.packageMeta.some((p) => p === `${packageName}@${version}`)
-  )?.version;
+    v.packageMeta.some(
+      (p) =>
+        p === `${packageName}@${version}` ||
+        p === `${packageName}@npm:${version}`
+    )
+  );
 }
 
 /**