fix(core): handle npm workspaces

nrwl · Dec 9, 2022 · 94ba43a · 94ba43a
1 parent 6e65b3e
commit 94ba43a
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 64 deletions.
diff --git a/packages/nx/src/lock-file/__fixtures__/npm.lock.ts b/packages/nx/src/lock-file/__fixtures__/npm.lock.ts
@@ -22642,41 +22642,3 @@ export const lockFileV1YargsAndDevkitOnly = `{
   }
 }
 `;
-
-/**
- * V1
- * dependencies:
- *   "workspace-a": {
-        "version": "file:workspace-a",
-        "requires": {
-          "@nrwl/devkit": "15.0.13",
-          "postgres": "charsleysa/postgres#fix-errors-compiled",
-          "yargs": "17.6.2"
-        }
-      },
-*/
-
-/**
- * V1
- * packages:
- *   "node_modules/workspace-a": {
-        "resolved": "workspace-a",
-        "link": true
-      },
-      "workspace-a": {
-        "dependencies": {
-          "@nrwl/devkit": "15.0.13",
-          "postgres": "charsleysa/postgres#fix-errors-compiled",
-          "yargs": "17.6.2"
-        }
-      },
-* dependencies:
-    "workspace-a": {
-      "version": "file:workspace-a",
-      "requires": {
-        "@nrwl/devkit": "15.0.13",
-        "postgres": "charsleysa/postgres#fix-errors-compiled",
-        "yargs": "17.6.2"
-      }
-    },
-*/
diff --git a/packages/nx/src/lock-file/npm.spec.ts b/packages/nx/src/lock-file/npm.spec.ts
@@ -121,7 +121,9 @@ describe('npm LockFile utility', () => {
     });
 
     it('should match the original file on stringification', () => {
-      expect(stringifyNpmLockFile(parsedLockFile)).toEqual(lockFileV3);
+      expect(JSON.parse(stringifyNpmLockFile(parsedLockFile))).toEqual(
+        JSON.parse(lockFileV3)
+      );
     });
 
     it('should prune the lock file', () => {
@@ -139,18 +141,22 @@ describe('npm LockFile utility', () => {
 
     it('should correctly prune lockfile with single package', () => {
       expect(
-        stringifyNpmLockFile(
-          pruneNpmLockFile(parsedLockFile, TypeScriptOnlyPackage)
+        JSON.parse(
+          stringifyNpmLockFile(
+            pruneNpmLockFile(parsedLockFile, TypeScriptOnlyPackage)
+          )
         )
-      ).toEqual(lockFileV3JustTypescript);
+      ).toEqual(JSON.parse(lockFileV3JustTypescript));
     });
 
     it('should correctly prune lockfile with multiple packages', () => {
       expect(
-        stringifyNpmLockFile(
-          pruneNpmLockFile(parsedLockFile, YargsAndDevkitPackage)
+        JSON.parse(
+          stringifyNpmLockFile(
+            pruneNpmLockFile(parsedLockFile, YargsAndDevkitPackage)
+          )
         )
-      ).toEqual(lockFileV3YargsAndDevkitOnly);
+      ).toEqual(JSON.parse(lockFileV3YargsAndDevkitOnly));
     });
   });
 
@@ -189,8 +195,8 @@ describe('npm LockFile utility', () => {
       const parsedWorkspaceLockFile = parseNpmLockFile(
         npmLockFileWithWorkspaces
       );
-      expect(stringifyNpmLockFile(parsedWorkspaceLockFile)).toEqual(
-        npmLockFileWithWorkspaces
+      expect(JSON.parse(stringifyNpmLockFile(parsedWorkspaceLockFile))).toEqual(
+        JSON.parse(npmLockFileWithWorkspaces)
       );
     });
 
@@ -244,7 +250,9 @@ describe('npm LockFile utility', () => {
     });
 
     it('should match the original file on stringification', () => {
-      expect(stringifyNpmLockFile(parsedLockFile)).toEqual(lockFileV2);
+      expect(JSON.parse(stringifyNpmLockFile(parsedLockFile))).toEqual(
+        JSON.parse(lockFileV2)
+      );
     });
 
     it('should prune the lock file', () => {
@@ -262,16 +270,18 @@ describe('npm LockFile utility', () => {
 
     it('should correctly prune lockfile with single package', () => {
       expect(
-        stringifyNpmLockFile(
-          pruneNpmLockFile(parsedLockFile, TypeScriptOnlyPackage)
+        JSON.parse(
+          stringifyNpmLockFile(
+            pruneNpmLockFile(parsedLockFile, TypeScriptOnlyPackage)
+          )
         )
-      ).toEqual(lockFileV2JustTypescript);
+      ).toEqual(JSON.parse(lockFileV2JustTypescript));
     });
 
     it('should correctly prune lockfile with multiple packages', () => {
       const pruned = pruneNpmLockFile(parsedLockFile, YargsAndDevkitPackage);
-      expect(stringifyNpmLockFile(pruned)).toEqual(
-        lockFileV2YargsAndDevkitOnly
+      expect(JSON.parse(stringifyNpmLockFile(pruned))).toEqual(
+        JSON.parse(lockFileV2YargsAndDevkitOnly)
       );
     });
   });
@@ -345,7 +355,9 @@ describe('npm LockFile utility', () => {
     });
 
     it('should match the original file on stringification', () => {
-      expect(stringifyNpmLockFile(parsedLockFile)).toEqual(lockFileV1);
+      expect(JSON.parse(stringifyNpmLockFile(parsedLockFile))).toEqual(
+        JSON.parse(lockFileV1)
+      );
     });
 
     describe('pruning', () => {
@@ -378,16 +390,18 @@ describe('npm LockFile utility', () => {
 
       it('should correctly prune lockfile with single package', () => {
         expect(
-          stringifyNpmLockFile(
-            pruneNpmLockFile(parsedLockFile, TypeScriptOnlyPackage)
+          JSON.parse(
+            stringifyNpmLockFile(
+              pruneNpmLockFile(parsedLockFile, TypeScriptOnlyPackage)
+            )
           )
-        ).toEqual(lockFileV1JustTypescript);
+        ).toEqual(JSON.parse(lockFileV1JustTypescript));
       });
 
       it('should correctly prune lockfile with multiple packages', () => {
         const pruned = pruneNpmLockFile(parsedLockFile, YargsAndDevkitPackage);
-        expect(stringifyNpmLockFile(pruned)).toEqual(
-          lockFileV1YargsAndDevkitOnly
+        expect(JSON.parse(stringifyNpmLockFile(pruned))).toEqual(
+          JSON.parse(lockFileV1YargsAndDevkitOnly)
         );
       });
     });

diff --git a/packages/nx/src/lock-file/npm.ts b/packages/nx/src/lock-file/npm.ts
@@ -7,7 +7,7 @@ import { workspaceRoot } from '../utils/workspace-root';
 import { LockFileData, PackageDependency } from './utils/lock-file-type';
 import { TransitiveLookupFunctionInput } from './utils/mapping';
 import { hashString, generatePrunnedHash } from './utils/hashing';
-import { PackageJsonDeps } from './utils/pruning';
+import type { PackageJsonDeps } from './utils/pruning';
 
 type PackageMeta = {
   path: string;
@@ -197,10 +197,11 @@ function mapPackageDependency(
 
     mappedPackages[packageName][key] = {
       ...(value as Omit<PackageDependency, 'packageMeta'>),
-      ...(!value.integrity && {
-        actualVersion: value.version,
-        version: value.resolved,
-      }),
+      ...(!value.integrity &&
+        value.version && {
+          actualVersion: value.version,
+          version: value.resolved,
+        }),
       ...(value.integrity &&
         dependencyValue && {
           actualVersion: value.version,