fix: bump lockfile version

pnpm · May 19, 2023 · 3471b45 · 3471b45
1 parent caa5dd3
commit 3471b45
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/__fixtures__/empty/pnpm-lock.yaml b/__fixtures__/empty/pnpm-lock.yaml
diff --git a/__fixtures__/local-pkg/pnpm-lock.yaml b/__fixtures__/local-pkg/pnpm-lock.yaml
diff --git a/__fixtures__/local-scoped-pkg/pnpm-lock.yaml b/__fixtures__/local-scoped-pkg/pnpm-lock.yaml
diff --git a/__fixtures__/multiple-scripts-error-exit/pnpm-lock.yaml b/__fixtures__/multiple-scripts-error-exit/pnpm-lock.yaml
diff --git a/__fixtures__/pnpm-lock.yaml b/__fixtures__/pnpm-lock.yaml
diff --git a/__fixtures__/tar-pkg/pnpm-lock.yaml b/__fixtures__/tar-pkg/pnpm-lock.yaml
diff --git a/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts b/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts
@@ -113,7 +113,7 @@ export function revertFromInlineSpecifiersFormat (lockfile: InlineSpecifiersLock
 
   let revertedImporters = mapValues(importers, revertProjectSnapshot)
   let packages = lockfile.packages
-  if (originalVersion === 6) {
+  if (originalVersionStr.startsWith('6.')) {
     revertedImporters = Object.fromEntries(
       Object.entries(revertedImporters ?? {})
         .map(([importerId, pkgSnapshot]: [string, ProjectSnapshot]) => {
@@ -150,7 +150,7 @@ export function revertFromInlineSpecifiersFormat (lockfile: InlineSpecifiersLock
     packages,
     importers: revertedImporters,
   }
-  if (originalVersion === 6 && newLockfile.time) {
+  if (originalVersionStr.startsWith('6.') && newLockfile.time) {
     newLockfile.time = Object.fromEntries(
       Object.entries(newLockfile.time)
         .map(([depPath, time]) => [convertLockfileV6DepPathToV5DepPath(depPath), time])

diff --git a/packages/constants/src/index.ts b/packages/constants/src/index.ts
@@ -1,6 +1,6 @@
 export const WANTED_LOCKFILE = 'pnpm-lock.yaml'
 export const LOCKFILE_VERSION = 5.4
-export const LOCKFILE_VERSION_V6 = '6.0'
+export const LOCKFILE_VERSION_V6 = '6.1'
 
 export const ENGINE_NAME = `${process.platform}-${process.arch}-node-${process.version.split('.')[0]}`
 export const LAYOUT_VERSION = 5

diff --git a/pkg-manager/core/test/lockfile.ts b/pkg-manager/core/test/lockfile.ts
@@ -1494,15 +1494,15 @@ test('lockfile v6', async () => {
 
   {
     const lockfile = await readYamlFile<any>(WANTED_LOCKFILE) // eslint-disable-line @typescript-eslint/no-explicit-any
-    expect(lockfile.lockfileVersion).toBe('6.0')
+    expect(lockfile.lockfileVersion).toBe(LOCKFILE_VERSION)
     expect(lockfile.packages).toHaveProperty(['/@pnpm.e2e/pkg-with-1-dep@100.0.0'])
   }
 
   await addDependenciesToPackage(manifest, ['@pnpm.e2e/foo@100.0.0'], await testDefaults())
 
   {
     const lockfile = await readYamlFile<any>(WANTED_LOCKFILE) // eslint-disable-line @typescript-eslint/no-explicit-any
-    expect(lockfile.lockfileVersion).toBe('6.0')
+    expect(lockfile.lockfileVersion).toBe(LOCKFILE_VERSION)
     expect(lockfile.packages).toHaveProperty(['/@pnpm.e2e/pkg-with-1-dep@100.0.0'])
     expect(lockfile.packages).toHaveProperty(['/@pnpm.e2e/foo@100.0.0'])
   }
@@ -1516,7 +1516,7 @@ test('lockfile v5 is converted to lockfile v6', async () => {
   await install({ dependencies: { '@pnpm.e2e/pkg-with-1-dep': '100.0.0' } }, await testDefaults())
 
   const lockfile = await readYamlFile<any>(WANTED_LOCKFILE) // eslint-disable-line @typescript-eslint/no-explicit-any
-  expect(lockfile.lockfileVersion).toBe('6.0')
+  expect(lockfile.lockfileVersion).toBe(LOCKFILE_VERSION)
   expect(lockfile.packages).toHaveProperty(['/@pnpm.e2e/pkg-with-1-dep@100.0.0'])
 })