@pnpm/lockfile.fs 1100.2.3 → 1100.2.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @pnpm/lockfile-file
 
+## 1100.2.4
+
+### Patch Changes
+
+- Fixed `pnpm install --merge-git-branch-lockfiles --frozen-lockfile` failing with `ERR_PNPM_OUTDATED_LOCKFILE` when a branch lockfile predates the removal of a dependency, or its move to another dependency group [#13966](https://github.com/pnpm/pnpm/issues/13966). A dependency that no project declares anymore is no longer reinstated by the merge, and the packages it was the only path to are dropped with it.
+
 ## 1100.2.3
 
 ### Patch Changes

package/lib/read.d.ts

@@ -13,6 +13,25 @@ export declare function readWantedLockfileAndAutofixConflicts(pkgPath: string, o
     lockfile: LockfileObject | null;
     hadConflicts: boolean;
 }>;
+/**
+ * {@link readWantedLockfile} plus what the caller cannot reconstruct from
+ * the returned lockfile: whether autofixing a merge conflict rewrote it,
+ * and, under `mergeGitBranchLockfiles`, the importers as they stood
+ * before the branch lockfiles were folded in. Telling a merged entry from
+ * one the read file already carried needs that "before", which the merged
+ * object no longer holds.
+ */
+export declare function readWantedLockfileWithMergeInfo(pkgPath: string, opts: {
+    wantedVersions?: string[];
+    ignoreIncompatible: boolean;
+    useGitBranchLockfile?: boolean;
+    mergeGitBranchLockfiles?: boolean;
+    autofixMergeConflicts?: boolean;
+}): Promise<{
+    lockfile: LockfileObject | null;
+    hadConflicts: boolean;
+    preMergeImporters: LockfileObject['importers'] | undefined;
+}>;
 export declare function readWantedLockfile(pkgPath: string, opts: {
     wantedVersions?: string[];
     ignoreIncompatible: boolean;

package/lib/read.js

@@ -25,6 +25,17 @@ export async function readWantedLockfileAndAutofixConflicts(pkgPath, opts) {
         autofixMergeConflicts: true,
     });
 }
+/**
+ * {@link readWantedLockfile} plus what the caller cannot reconstruct from
+ * the returned lockfile: whether autofixing a merge conflict rewrote it,
+ * and, under `mergeGitBranchLockfiles`, the importers as they stood
+ * before the branch lockfiles were folded in. Telling a merged entry from
+ * one the read file already carried needs that "before", which the merged
+ * object no longer holds.
+ */
+export async function readWantedLockfileWithMergeInfo(pkgPath, opts) {
+    return _readWantedLockfile(pkgPath, opts);
+}
 export async function readWantedLockfile(pkgPath, opts) {
     return (await _readWantedLockfile(pkgPath, opts)).lockfile;
 }
@@ -168,11 +179,13 @@ async function _readWantedLockfile(pkgPath, opts) {
         }
     }
     let result = { lockfile: null, lockfileFile: null, hadConflicts: false };
+    let preMergeImporters;
     /* eslint-disable no-await-in-loop */
     for (const lockfileName of lockfileNames) {
         result = await _read(path.join(pkgPath, lockfileName), pkgPath, { ...opts, autofixMergeConflicts: true });
         if (result.lockfile) {
             if (opts.mergeGitBranchLockfiles) {
+                preMergeImporters = result.lockfile.importers;
                 result.lockfile = await _mergeGitBranchLockfiles(result.lockfile, pkgPath, pkgPath, opts);
                 result.lockfileFile = result.lockfile ? convertToLockfileFile(result.lockfile) : null;
             }
@@ -180,7 +193,7 @@ async function _readWantedLockfile(pkgPath, opts) {
         }
     }
     /* eslint-enable no-await-in-loop */
-    return result;
+    return { ...result, preMergeImporters };
 }
 async function _mergeGitBranchLockfiles(lockfile, lockfileDir, prefix, opts) {
     if (!lockfile) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/lockfile.fs",
-  "version": "1100.2.3",
+  "version": "1100.2.4",
   "description": "Read/write pnpm-lock.yaml files",
   "keywords": [
     "pnpm",
@@ -52,7 +52,7 @@
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/lockfile.fs": "1100.2.3",
+    "@pnpm/lockfile.fs": "1100.2.4",
     "@pnpm/logger": "1100.0.0",
     "@types/js-yaml": "^4.0.9",
     "@types/normalize-path": "^3.0.2",