Merge pull request #306 from ghiscoding/bugfix/yarn-lock-v2

fix(version): properly update dependencies npm lockfile v2
lerna-lite · Aug 10, 2022 · bc374c5 · bc374c5
2 parents 5927f80 + 0abfa85
commit bc374c5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/__fixtures__/lockfile-leaf-v2/packages/package-1/package-lock.json b/__fixtures__/lockfile-leaf-v2/packages/package-1/package-lock.json
diff --git a/__fixtures__/lockfile-leaf-v2/packages/package-1/package.json b/__fixtures__/lockfile-leaf-v2/packages/package-1/package.json
@@ -2,6 +2,10 @@
   "name": "package-1",
   "version": "1.0.0",
   "dependencies": {
-    "tiny-tarball": "^1.0.0"
+    "tiny-tarball": "^1.0.0",
+    "package-2": "^1.0.0"
+  },
+  "devDependencies": {
+    "package-3": "2.0.0"
   }
 }
diff --git a/packages/version/src/__tests__/update-lockfile-version.spec.ts b/packages/version/src/__tests__/update-lockfile-version.spec.ts
@@ -44,14 +44,18 @@ describe('npm classic lock file', () => {
     const [pkg] = await Project.getPackages(cwd);
 
     pkg.version = '2.0.0';
+    pkg.dependencies['package-1'] = '^2.0.0';
+    pkg.devDependencies['package-2'] = '3.0.0';
 
     const returnedLockfilePath = await updateClassicLockfileVersion(pkg as unknown as Package);
 
     expect(returnedLockfilePath).toBe(path.join(pkg.location, 'package-lock.json'));
     expect(Array.from((loadJsonFile as any).registry.keys())).toStrictEqual(['/packages/package-1']);
     const updatedLockfile = fs.readJSONSync(returnedLockfilePath as string);
     expect(updatedLockfile).toHaveProperty('version', '2.0.0');
-    expect(updatedLockfile).toHaveProperty(['packages', '', 'version'], '2.0.0');
+    expect(updatedLockfile).toHaveProperty(['packages', '', 'dependencies', 'package-1'], '^2.0.0');
+    expect(updatedLockfile).toHaveProperty(['packages', '', 'dependencies', 'tiny-tarball'], '^1.0.0');
+    expect(updatedLockfile).toHaveProperty(['packages', '', 'devDependencies', 'package-2'], '3.0.0');
   });
 
   test('updateClassicLockfileVersion without sibling lockfile', async () => {

diff --git a/packages/version/src/lib/update-lockfile-version.ts b/packages/version/src/lib/update-lockfile-version.ts
@@ -45,6 +45,12 @@ export async function updateClassicLockfileVersion(pkg: Package): Promise<string
       // update version for a npm lockfile v2 format
       if (pkgLockFileObj.packages?.['']) {
         pkgLockFileObj.packages[''].version = pkg.version;
+        if (pkgLockFileObj.packages[''].dependencies) {
+          pkgLockFileObj.packages[''].dependencies = pkg.dependencies;
+        }
+        if (pkgLockFileObj.packages[''].devDependencies) {
+          pkgLockFileObj.packages[''].devDependencies = pkg.devDependencies;
+        }
       }
 
       await writeJsonFile(lockFilePath, pkgLockFileObj, {