Skip to content

Commit 2f2f5ba

Browse files
committed
Preserve pnpm lockfile version when pruning
1 parent b9f544e commit 2f2f5ba

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/lib/lockfile/helpers/generate-pnpm-lockfile.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export async function generatePnpmLockfile({
4141
* versions after 9, because we might get lucky. If it does change, things
4242
* would break either way.
4343
*/
44-
const useVersion9 = majorVersion >= 9;
44+
const useReadVersion9 = majorVersion >= 9;
4545

4646
const { includeDevDependencies, includePatchedDependencies } = useConfig();
4747
const log = useLogger();
@@ -51,7 +51,7 @@ export async function generatePnpmLockfile({
5151
try {
5252
const isRush = isRushWorkspace(workspaceRootDir);
5353

54-
const lockfile = useVersion9
54+
const lockfile = useReadVersion9
5555
? await readWantedLockfile_v9(
5656
isRush
5757
? path.join(workspaceRootDir, "common/config/rush")
@@ -71,7 +71,11 @@ export async function generatePnpmLockfile({
7171

7272
assert(lockfile, `No input lockfile found at ${workspaceRootDir}`);
7373

74-
const targetImporterId = useVersion9
74+
const [lockfileMajorVersion] = String(lockfile.lockfileVersion).split(".");
75+
76+
const useLockfileVersion9 = lockfileMajorVersion >= "9";
77+
78+
const targetImporterId = useLockfileVersion9
7579
? getLockfileImporterId_v9(workspaceRootDir, targetPackageDir)
7680
: getLockfileImporterId_v8(workspaceRootDir, targetPackageDir);
7781

@@ -141,7 +145,7 @@ export async function generatePnpmLockfile({
141145

142146
log.debug("Pruning the lockfile");
143147

144-
const prunedLockfile = useVersion9
148+
const prunedLockfile = useLockfileVersion9
145149
? await pruneLockfile_v9(lockfile, targetPackageManifest, ".")
146150
: await pruneLockfile_v8(lockfile, targetPackageManifest, ".");
147151

@@ -160,7 +164,7 @@ export async function generatePnpmLockfile({
160164
? lockfile.patchedDependencies
161165
: undefined;
162166

163-
useVersion9
167+
useLockfileVersion9
164168
? await writeWantedLockfile_v9(isolateDir, {
165169
...prunedLockfile,
166170
patchedDependencies,

0 commit comments

Comments
 (0)