diff --git a/__fixtures__/circular/pnpm-lock.yaml b/__fixtures__/circular/pnpm-lock.yaml index 367f784d65..b15704440d 100644 --- a/__fixtures__/circular/pnpm-lock.yaml +++ b/__fixtures__/circular/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/custom-modules-dir/pnpm-lock.yaml b/__fixtures__/custom-modules-dir/pnpm-lock.yaml index 77bb5783e7..ad7ced41ce 100644 --- a/__fixtures__/custom-modules-dir/pnpm-lock.yaml +++ b/__fixtures__/custom-modules-dir/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' importers: diff --git a/__fixtures__/empty/pnpm-lock.yaml b/__fixtures__/empty/pnpm-lock.yaml index f4c8b00745..9b60ae1782 100644 --- a/__fixtures__/empty/pnpm-lock.yaml +++ b/__fixtures__/empty/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/fixture-with-external-shrinkwrap/pnpm-lock.yaml b/__fixtures__/fixture-with-external-shrinkwrap/pnpm-lock.yaml index fa01421b39..be5fd48355 100644 --- a/__fixtures__/fixture-with-external-shrinkwrap/pnpm-lock.yaml +++ b/__fixtures__/fixture-with-external-shrinkwrap/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' importers: diff --git a/__fixtures__/fixture-with-no-pkg-name-and-no-version/pnpm-lock.yaml b/__fixtures__/fixture-with-no-pkg-name-and-no-version/pnpm-lock.yaml index d38a4b7dd9..3fd2cdb629 100644 --- a/__fixtures__/fixture-with-no-pkg-name-and-no-version/pnpm-lock.yaml +++ b/__fixtures__/fixture-with-no-pkg-name-and-no-version/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/fixture-with-no-pkg-version/pnpm-lock.yaml b/__fixtures__/fixture-with-no-pkg-version/pnpm-lock.yaml index d38a4b7dd9..3fd2cdb629 100644 --- a/__fixtures__/fixture-with-no-pkg-version/pnpm-lock.yaml +++ b/__fixtures__/fixture-with-no-pkg-version/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/fixture/pnpm-lock.yaml b/__fixtures__/fixture/pnpm-lock.yaml index 7ae88408af..ef7732e331 100644 --- a/__fixtures__/fixture/pnpm-lock.yaml +++ b/__fixtures__/fixture/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/fixtureWithLinks/general/pnpm-lock.yaml b/__fixtures__/fixtureWithLinks/general/pnpm-lock.yaml index 44b40b43e8..23e7742f2d 100644 --- a/__fixtures__/fixtureWithLinks/general/pnpm-lock.yaml +++ b/__fixtures__/fixtureWithLinks/general/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' dependencies: minimatch: diff --git a/__fixtures__/fixtureWithLinks/with-links-only/pnpm-lock.yaml b/__fixtures__/fixtureWithLinks/with-links-only/pnpm-lock.yaml index fb4facd6b0..91d86925f9 100644 --- a/__fixtures__/fixtureWithLinks/with-links-only/pnpm-lock.yaml +++ b/__fixtures__/fixtureWithLinks/with-links-only/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' dependencies: general: diff --git a/__fixtures__/general/pnpm-lock.yaml b/__fixtures__/general/pnpm-lock.yaml index 795567e4ad..bd0abffb8c 100644 --- a/__fixtures__/general/pnpm-lock.yaml +++ b/__fixtures__/general/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/has-2-outdated-deps/node_modules/.pnpm/lock.yaml b/__fixtures__/has-2-outdated-deps/node_modules/.pnpm/lock.yaml index 09e408e1b1..a64bda178e 100644 --- a/__fixtures__/has-2-outdated-deps/node_modules/.pnpm/lock.yaml +++ b/__fixtures__/has-2-outdated-deps/node_modules/.pnpm/lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/has-2-outdated-deps/pnpm-lock.yaml b/__fixtures__/has-2-outdated-deps/pnpm-lock.yaml index 09e408e1b1..a64bda178e 100644 --- a/__fixtures__/has-2-outdated-deps/pnpm-lock.yaml +++ b/__fixtures__/has-2-outdated-deps/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/has-major-outdated-deps/pnpm-lock.yaml b/__fixtures__/has-major-outdated-deps/pnpm-lock.yaml index 577697c31d..2168cf36ae 100644 --- a/__fixtures__/has-major-outdated-deps/pnpm-lock.yaml +++ b/__fixtures__/has-major-outdated-deps/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' dependencies: is-negative: diff --git a/__fixtures__/has-not-outdated-deps/pnpm-lock.yaml b/__fixtures__/has-not-outdated-deps/pnpm-lock.yaml index 3c77b4d012..9c55d9b43c 100644 --- a/__fixtures__/has-not-outdated-deps/pnpm-lock.yaml +++ b/__fixtures__/has-not-outdated-deps/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' importers: diff --git a/__fixtures__/has-outdated-deps-and-external-shrinkwrap/pnpm-lock.yaml b/__fixtures__/has-outdated-deps-and-external-shrinkwrap/pnpm-lock.yaml index 06d7059fdc..485c0e284f 100644 --- a/__fixtures__/has-outdated-deps-and-external-shrinkwrap/pnpm-lock.yaml +++ b/__fixtures__/has-outdated-deps-and-external-shrinkwrap/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' importers: pkg: diff --git a/__fixtures__/has-outdated-deps/pnpm-lock.yaml b/__fixtures__/has-outdated-deps/pnpm-lock.yaml index f149e3fd74..f7201a2f28 100644 --- a/__fixtures__/has-outdated-deps/pnpm-lock.yaml +++ b/__fixtures__/has-outdated-deps/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' importers: diff --git a/__fixtures__/local-pkg/pnpm-lock.yaml b/__fixtures__/local-pkg/pnpm-lock.yaml index f4c8b00745..9b60ae1782 100644 --- a/__fixtures__/local-pkg/pnpm-lock.yaml +++ b/__fixtures__/local-pkg/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/local-scoped-pkg/pnpm-lock.yaml b/__fixtures__/local-scoped-pkg/pnpm-lock.yaml index f4c8b00745..9b60ae1782 100644 --- a/__fixtures__/local-scoped-pkg/pnpm-lock.yaml +++ b/__fixtures__/local-scoped-pkg/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/monorepo/pnpm-lock.yaml b/__fixtures__/monorepo/pnpm-lock.yaml index 7a9b1279a2..d087190875 100644 --- a/__fixtures__/monorepo/pnpm-lock.yaml +++ b/__fixtures__/monorepo/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' importers: package: diff --git a/__fixtures__/multiple-scripts-error-exit/pnpm-lock.yaml b/__fixtures__/multiple-scripts-error-exit/pnpm-lock.yaml index f4c8b00745..9b60ae1782 100644 --- a/__fixtures__/multiple-scripts-error-exit/pnpm-lock.yaml +++ b/__fixtures__/multiple-scripts-error-exit/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/pkg-with-external-lockfile/pnpm-lock.yaml b/__fixtures__/pkg-with-external-lockfile/pnpm-lock.yaml index 7f5845df17..1acca44878 100644 --- a/__fixtures__/pkg-with-external-lockfile/pnpm-lock.yaml +++ b/__fixtures__/pkg-with-external-lockfile/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/pnpm-lock.yaml b/__fixtures__/pnpm-lock.yaml index f4c8b00745..9b60ae1782 100644 --- a/__fixtures__/pnpm-lock.yaml +++ b/__fixtures__/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/tar-pkg/pnpm-lock.yaml b/__fixtures__/tar-pkg/pnpm-lock.yaml index f4c8b00745..9b60ae1782 100644 --- a/__fixtures__/tar-pkg/pnpm-lock.yaml +++ b/__fixtures__/tar-pkg/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/with-aliased-dep/pnpm-lock.yaml b/__fixtures__/with-aliased-dep/pnpm-lock.yaml index 3587dde9f5..c83ae7f203 100644 --- a/__fixtures__/with-aliased-dep/pnpm-lock.yaml +++ b/__fixtures__/with-aliased-dep/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/with-file-dep/pnpm-lock.yaml b/__fixtures__/with-file-dep/pnpm-lock.yaml index c7adffc952..fd42f0419e 100644 --- a/__fixtures__/with-file-dep/pnpm-lock.yaml +++ b/__fixtures__/with-file-dep/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/with-git-protocol-dep/pnpm-lock.yaml b/__fixtures__/with-git-protocol-dep/pnpm-lock.yaml index 12ffddd53d..fcab7a6117 100644 --- a/__fixtures__/with-git-protocol-dep/pnpm-lock.yaml +++ b/__fixtures__/with-git-protocol-dep/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/with-non-package-dep/pnpm-lock.yaml b/__fixtures__/with-non-package-dep/pnpm-lock.yaml index 7f660aa839..b646ad0cf9 100644 --- a/__fixtures__/with-non-package-dep/pnpm-lock.yaml +++ b/__fixtures__/with-non-package-dep/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/with-peer/pnpm-lock.yaml b/__fixtures__/with-peer/pnpm-lock.yaml index 1d4e991f0a..a7f3d33fb3 100644 --- a/__fixtures__/with-peer/pnpm-lock.yaml +++ b/__fixtures__/with-peer/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/with-pnpm-update-ignore/pnpm-lock.yaml b/__fixtures__/with-pnpm-update-ignore/pnpm-lock.yaml index b3ccab8053..2f7a4880ba 100644 --- a/__fixtures__/with-pnpm-update-ignore/pnpm-lock.yaml +++ b/__fixtures__/with-pnpm-update-ignore/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/with-unsaved-deps/pnpm-lock.yaml b/__fixtures__/with-unsaved-deps/pnpm-lock.yaml index fc82804f7d..d207bf1de3 100644 --- a/__fixtures__/with-unsaved-deps/pnpm-lock.yaml +++ b/__fixtures__/with-unsaved-deps/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/workspace-external-depends-deep/pnpm-lock.yaml b/__fixtures__/workspace-external-depends-deep/pnpm-lock.yaml index a943ae152c..abaf1c49e8 100644 --- a/__fixtures__/workspace-external-depends-deep/pnpm-lock.yaml +++ b/__fixtures__/workspace-external-depends-deep/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' importers: diff --git a/__fixtures__/workspace-has-shared-npm-shrinkwrap-json/pnpm-lock.yaml b/__fixtures__/workspace-has-shared-npm-shrinkwrap-json/pnpm-lock.yaml index 689d650ceb..b0a073a9c1 100644 --- a/__fixtures__/workspace-has-shared-npm-shrinkwrap-json/pnpm-lock.yaml +++ b/__fixtures__/workspace-has-shared-npm-shrinkwrap-json/pnpm-lock.yaml @@ -1 +1 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' diff --git a/__fixtures__/workspace-has-shared-package-lock-json/pnpm-lock.yaml b/__fixtures__/workspace-has-shared-package-lock-json/pnpm-lock.yaml index 689d650ceb..b0a073a9c1 100644 --- a/__fixtures__/workspace-has-shared-package-lock-json/pnpm-lock.yaml +++ b/__fixtures__/workspace-has-shared-package-lock-json/pnpm-lock.yaml @@ -1 +1 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' diff --git a/__fixtures__/workspace-has-shared-yarn-lock/pnpm-lock.yaml b/__fixtures__/workspace-has-shared-yarn-lock/pnpm-lock.yaml index 689d650ceb..b0a073a9c1 100644 --- a/__fixtures__/workspace-has-shared-yarn-lock/pnpm-lock.yaml +++ b/__fixtures__/workspace-has-shared-yarn-lock/pnpm-lock.yaml @@ -1 +1 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' diff --git a/__fixtures__/workspace-with-2-pkgs/pnpm-lock.yaml b/__fixtures__/workspace-with-2-pkgs/pnpm-lock.yaml index b82461045d..24d9c41d93 100644 --- a/__fixtures__/workspace-with-2-pkgs/pnpm-lock.yaml +++ b/__fixtures__/workspace-with-2-pkgs/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' importers: diff --git a/__fixtures__/workspace-with-different-deps/pnpm-lock.yaml b/__fixtures__/workspace-with-different-deps/pnpm-lock.yaml index db2438b0d9..c065e728c1 100644 --- a/__fixtures__/workspace-with-different-deps/pnpm-lock.yaml +++ b/__fixtures__/workspace-with-different-deps/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' importers: diff --git a/__fixtures__/workspace-with-lockfile-dupes/pnpm-lock.yaml b/__fixtures__/workspace-with-lockfile-dupes/pnpm-lock.yaml index 66453d388b..fc4ad8f286 100644 --- a/__fixtures__/workspace-with-lockfile-dupes/pnpm-lock.yaml +++ b/__fixtures__/workspace-with-lockfile-dupes/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/workspace-with-lockfile-subdep-dupes/pnpm-lock.yaml b/__fixtures__/workspace-with-lockfile-subdep-dupes/pnpm-lock.yaml index 228d7e4cf3..1630a56a54 100644 --- a/__fixtures__/workspace-with-lockfile-subdep-dupes/pnpm-lock.yaml +++ b/__fixtures__/workspace-with-lockfile-subdep-dupes/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/__fixtures__/workspace-with-nested-workspace-deps/pnpm-lock.yaml b/__fixtures__/workspace-with-nested-workspace-deps/pnpm-lock.yaml index d67291e3a3..d8af73e164 100644 --- a/__fixtures__/workspace-with-nested-workspace-deps/pnpm-lock.yaml +++ b/__fixtures__/workspace-with-nested-workspace-deps/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' importers: diff --git a/__fixtures__/workspace-with-private-pkgs/pnpm-lock.yaml b/__fixtures__/workspace-with-private-pkgs/pnpm-lock.yaml index 2c7df47b51..57da9d907d 100644 --- a/__fixtures__/workspace-with-private-pkgs/pnpm-lock.yaml +++ b/__fixtures__/workspace-with-private-pkgs/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' importers: diff --git a/__utils__/assert-store/test/fixture/project/pnpm-lock.yaml b/__utils__/assert-store/test/fixture/project/pnpm-lock.yaml index e7439fce82..30f74f11b1 100644 --- a/__utils__/assert-store/test/fixture/project/pnpm-lock.yaml +++ b/__utils__/assert-store/test/fixture/project/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' dependencies: is-positive: diff --git a/lockfile/lockfile-file/src/lockfileFormatConverters.ts b/lockfile/lockfile-file/src/lockfileFormatConverters.ts index c051f7f231..7cd7d0562c 100644 --- a/lockfile/lockfile-file/src/lockfileFormatConverters.ts +++ b/lockfile/lockfile-file/src/lockfileFormatConverters.ts @@ -186,7 +186,7 @@ function convertFromLockfileFileMutable (lockfileFile: LockfileFile): InlineSpec export function convertToLockfileObject (lockfile: LockfileFile | LockfileFileV7): Lockfile { if ((lockfile as LockfileFileV7).snapshots) { - return convertLockfileV7ToLockfileObject(lockfile as LockfileFileV7) + return convertLockfileV9ToLockfileObject(lockfile as LockfileFileV7) } convertPkgIds(lockfile) const { importers, ...rest } = convertFromLockfileFileMutable(lockfile) @@ -268,7 +268,7 @@ function convertPkgIds (lockfile: LockfileFile) { } } -export function convertLockfileV7ToLockfileObject (lockfile: LockfileFileV7): Lockfile { +export function convertLockfileV9ToLockfileObject (lockfile: LockfileFileV7): Lockfile { const { importers, ...rest } = convertFromLockfileFileMutable(lockfile) const packages: PackageSnapshots = {} diff --git a/lockfile/lockfile-file/test/__snapshots__/write.test.ts.snap b/lockfile/lockfile-file/test/__snapshots__/write.test.ts.snap index 6458dfd323..32e0dfddc2 100644 --- a/lockfile/lockfile-file/test/__snapshots__/write.test.ts.snap +++ b/lockfile/lockfile-file/test/__snapshots__/write.test.ts.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`writeLockfiles() 1`] = ` -"lockfileVersion: '7.0' +"lockfileVersion: '9.0' importers: diff --git a/lockfile/lockfile-file/test/fixtures/2/pnpm-lock.yaml b/lockfile/lockfile-file/test/fixtures/2/pnpm-lock.yaml index c86c855a44..fe028d7a41 100644 --- a/lockfile/lockfile-file/test/fixtures/2/pnpm-lock.yaml +++ b/lockfile/lockfile-file/test/fixtures/2/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' dependencies: foo: version: '1.0.0' diff --git a/lockfile/lockfile-file/test/fixtures/6/pnpm-lock.branch.yaml b/lockfile/lockfile-file/test/fixtures/6/pnpm-lock.branch.yaml index 5044fda545..3b1c1a7d51 100644 --- a/lockfile/lockfile-file/test/fixtures/6/pnpm-lock.branch.yaml +++ b/lockfile/lockfile-file/test/fixtures/6/pnpm-lock.branch.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' dependencies: is-positive: diff --git a/lockfile/lockfile-file/test/fixtures/6/pnpm-lock.yaml b/lockfile/lockfile-file/test/fixtures/6/pnpm-lock.yaml index 85cb3408a8..d8399c013f 100644 --- a/lockfile/lockfile-file/test/fixtures/6/pnpm-lock.yaml +++ b/lockfile/lockfile-file/test/fixtures/6/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' dependencies: is-positive: diff --git a/lockfile/lockfile-file/test/lockfileV6Converters.test.ts b/lockfile/lockfile-file/test/lockfileV6Converters.test.ts index e8392d9455..25dc3254d5 100644 --- a/lockfile/lockfile-file/test/lockfileV6Converters.test.ts +++ b/lockfile/lockfile-file/test/lockfileV6Converters.test.ts @@ -2,7 +2,7 @@ import { convertToLockfileFile, convertToLockfileObject } from '../lib/lockfileF test('convertToLockfileFile()', () => { const lockfileV5 = { - lockfileVersion: '7.0', + lockfileVersion: '9.0', importers: { project1: { specifiers: { @@ -39,7 +39,7 @@ test('convertToLockfileFile()', () => { }, } const lockfileV6 = { - lockfileVersion: '7.0', + lockfileVersion: '9.0', importers: { project1: { dependencies: { @@ -93,7 +93,7 @@ test('convertToLockfileFile()', () => { test('convertToLockfileFile() with lockfile v6', () => { const lockfileV5 = { - lockfileVersion: '7.0', + lockfileVersion: '9.0', importers: { project1: { specifiers: { @@ -130,7 +130,7 @@ test('convertToLockfileFile() with lockfile v6', () => { }, } const lockfileV6 = { - lockfileVersion: '7.0', + lockfileVersion: '9.0', importers: { project1: { dependencies: { diff --git a/lockfile/lockfile-file/test/read.test.ts b/lockfile/lockfile-file/test/read.test.ts index 96ee3c8519..0244df8620 100644 --- a/lockfile/lockfile-file/test/read.test.ts +++ b/lockfile/lockfile-file/test/read.test.ts @@ -18,7 +18,7 @@ test('readWantedLockfile()', async () => { const lockfile = await readWantedLockfile(path.join('fixtures', '2'), { ignoreIncompatible: false, }) - expect(lockfile?.lockfileVersion).toEqual('7.0') + expect(lockfile?.lockfileVersion).toEqual('9.0') expect(lockfile?.importers).toStrictEqual({ '.': { dependencies: { @@ -88,7 +88,7 @@ test('writeWantedLockfile()', async () => { }, }, }, - lockfileVersion: '7.0', + lockfileVersion: '9.0', packages: { 'is-negative@1.0.0': { dependencies: { @@ -131,7 +131,7 @@ test('writeCurrentLockfile()', async () => { }, }, }, - lockfileVersion: '7.0', + lockfileVersion: '9.0', packages: { 'is-negative@1.0.0': { dependencies: { diff --git a/lockfile/lockfile-types/src/index.ts b/lockfile/lockfile-types/src/index.ts index c785d4cd31..02e4a86c07 100644 --- a/lockfile/lockfile-types/src/index.ts +++ b/lockfile/lockfile-types/src/index.ts @@ -22,7 +22,7 @@ export interface Lockfile { settings?: LockfileSettings } -export interface LockfileV7 { +export interface LockfileV9 { importers: Record lockfileVersion: number | string time?: Record diff --git a/lockfile/plugin-commands-audit/test/fixtures/has-vulnerabilities/pnpm-lock.yaml b/lockfile/plugin-commands-audit/test/fixtures/has-vulnerabilities/pnpm-lock.yaml index db2777a03f..2d9e80525e 100644 --- a/lockfile/plugin-commands-audit/test/fixtures/has-vulnerabilities/pnpm-lock.yaml +++ b/lockfile/plugin-commands-audit/test/fixtures/has-vulnerabilities/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' dependencies: karma: diff --git a/modules-mounter/daemon/test/__fixtures__/simple/pnpm-lock.yaml b/modules-mounter/daemon/test/__fixtures__/simple/pnpm-lock.yaml index 2beaf3f026..897ba0fa49 100644 --- a/modules-mounter/daemon/test/__fixtures__/simple/pnpm-lock.yaml +++ b/modules-mounter/daemon/test/__fixtures__/simple/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/packages/calc-dep-state/test/lockfileToDepGraph.test.ts b/packages/calc-dep-state/test/lockfileToDepGraph.test.ts index 0e24109387..14e71b816a 100644 --- a/packages/calc-dep-state/test/lockfileToDepGraph.test.ts +++ b/packages/calc-dep-state/test/lockfileToDepGraph.test.ts @@ -2,7 +2,7 @@ import { lockfileToDepGraph } from '@pnpm/calc-dep-state' test('lockfileToDepGraph', () => { expect(lockfileToDepGraph({ - lockfileVersion: '7.0', + lockfileVersion: '9.0', importers: {}, packages: { 'foo@1.0.0': { diff --git a/packages/constants/src/index.ts b/packages/constants/src/index.ts index f6daaddda1..4eefcbbae0 100644 --- a/packages/constants/src/index.ts +++ b/packages/constants/src/index.ts @@ -1,5 +1,6 @@ export const WANTED_LOCKFILE = 'pnpm-lock.yaml' -export const LOCKFILE_VERSION = '7.0' +export const LOCKFILE_MAJOR_VERSION = '9' +export const LOCKFILE_VERSION = `${LOCKFILE_MAJOR_VERSION}.0` export const LOCKFILE_VERSION_V6 = '6.0' export const ENGINE_NAME = `${process.platform}-${process.arch}-node-${process.version.split('.')[0]}` diff --git a/packages/make-dedicated-lockfile/test/fixtures/fixture/pnpm-lock.yaml b/packages/make-dedicated-lockfile/test/fixtures/fixture/pnpm-lock.yaml index 18bb7ff6a9..199605d948 100644 --- a/packages/make-dedicated-lockfile/test/fixtures/fixture/pnpm-lock.yaml +++ b/packages/make-dedicated-lockfile/test/fixtures/fixture/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/core/src/install/index.ts b/pkg-manager/core/src/install/index.ts index 953022583c..0ab3bf8b87 100644 --- a/pkg-manager/core/src/install/index.ts +++ b/pkg-manager/core/src/install/index.ts @@ -5,6 +5,7 @@ import { createAllowBuildFunction } from '@pnpm/builder.policy' import { LAYOUT_VERSION, LOCKFILE_VERSION, + LOCKFILE_MAJOR_VERSION, LOCKFILE_VERSION_V6, WANTED_LOCKFILE, } from '@pnpm/constants' @@ -351,7 +352,7 @@ export async function mutateModules ( } let needsFullResolution = outdatedLockfileSettings || opts.fixLockfile || - !ctx.wantedLockfile.lockfileVersion.toString().startsWith('7.') || + !ctx.wantedLockfile.lockfileVersion.toString().startsWith(`${LOCKFILE_MAJOR_VERSION}.`) || opts.forceFullResolution if (needsFullResolution) { ctx.wantedLockfile.settings = { diff --git a/pkg-manager/core/test/install/fixLockfile.ts b/pkg-manager/core/test/install/fixLockfile.ts index 4ead67ecbc..a14c98cd8e 100644 --- a/pkg-manager/core/test/install/fixLockfile.ts +++ b/pkg-manager/core/test/install/fixLockfile.ts @@ -4,7 +4,7 @@ import { prepareEmpty, preparePackages } from '@pnpm/prepare' import { install, type MutatedProject, mutateModules } from '@pnpm/core' import { sync as writeYamlFile } from 'write-yaml-file' import { sync as readYamlFile } from 'read-yaml-file' -import { type LockfileV7 as Lockfile, type PackageSnapshots } from '@pnpm/lockfile-file' +import { type LockfileV9 as Lockfile, type PackageSnapshots } from '@pnpm/lockfile-file' import { testDefaults } from '../utils' test('fix broken lockfile with --fix-lockfile', async () => { diff --git a/pkg-manager/core/test/install/local.ts b/pkg-manager/core/test/install/local.ts index 1d2dd45395..df334fbc20 100644 --- a/pkg-manager/core/test/install/local.ts +++ b/pkg-manager/core/test/install/local.ts @@ -1,7 +1,7 @@ import fs from 'fs' import path from 'path' import { LOCKFILE_VERSION } from '@pnpm/constants' -import { type LockfileV7 as Lockfile } from '@pnpm/lockfile-file' +import { type LockfileV9 as Lockfile } from '@pnpm/lockfile-file' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' import { fixtures } from '@pnpm/test-fixtures' diff --git a/pkg-manager/core/test/install/optionalDependencies.ts b/pkg-manager/core/test/install/optionalDependencies.ts index 085cabbd40..f62f64ce52 100644 --- a/pkg-manager/core/test/install/optionalDependencies.ts +++ b/pkg-manager/core/test/install/optionalDependencies.ts @@ -1,6 +1,6 @@ import fs from 'fs' import path from 'path' -import { type LockfileV7 as Lockfile } from '@pnpm/lockfile-file' +import { type LockfileV9 as Lockfile } from '@pnpm/lockfile-file' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import deepRequireCwd from 'deep-require-cwd' import { sync as readYamlFile } from 'read-yaml-file' diff --git a/pkg-manager/core/test/install/peerDependencies.ts b/pkg-manager/core/test/install/peerDependencies.ts index 366dabde89..0d753d3c7b 100644 --- a/pkg-manager/core/test/install/peerDependencies.ts +++ b/pkg-manager/core/test/install/peerDependencies.ts @@ -1,7 +1,7 @@ import fs from 'fs' import path from 'path' import { WANTED_LOCKFILE } from '@pnpm/constants' -import { type LockfileV7 as Lockfile } from '@pnpm/lockfile-file' +import { type LockfileV9 as Lockfile } from '@pnpm/lockfile-file' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import { addDistTag, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { fixtures } from '@pnpm/test-fixtures' diff --git a/pkg-manager/core/test/install/update.ts b/pkg-manager/core/test/install/update.ts index e87e841adc..7a763250be 100644 --- a/pkg-manager/core/test/install/update.ts +++ b/pkg-manager/core/test/install/update.ts @@ -1,6 +1,6 @@ import path from 'path' import { WANTED_LOCKFILE } from '@pnpm/constants' -import { type LockfileV7 as Lockfile } from '@pnpm/lockfile-file' +import { type LockfileV9 as Lockfile } from '@pnpm/lockfile-file' import { prepareEmpty } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' import { sync as readYamlFile } from 'read-yaml-file' diff --git a/pkg-manager/headless/test/fixtures/deps-have-lifecycle-scripts/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/deps-have-lifecycle-scripts/pnpm-lock.yaml index 3068cbc9a6..a1161ff40c 100644 --- a/pkg-manager/headless/test/fixtures/deps-have-lifecycle-scripts/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/deps-have-lifecycle-scripts/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/has-glob-and-rimraf/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/has-glob-and-rimraf/pnpm-lock.yaml index ba51c4d5c5..950e489db7 100644 --- a/pkg-manager/headless/test/fixtures/has-glob-and-rimraf/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/has-glob-and-rimraf/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/has-glob/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/has-glob/pnpm-lock.yaml index 6fc2d083a1..796db80707 100644 --- a/pkg-manager/headless/test/fixtures/has-glob/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/has-glob/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/has-incompatible-optional-subdep/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/has-incompatible-optional-subdep/pnpm-lock.yaml index b5cec7043b..971483193e 100644 --- a/pkg-manager/headless/test/fixtures/has-incompatible-optional-subdep/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/has-incompatible-optional-subdep/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/has-local-dep/pkg/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/has-local-dep/pkg/pnpm-lock.yaml index eef4b56a6f..5502aaf997 100644 --- a/pkg-manager/headless/test/fixtures/has-local-dep/pkg/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/has-local-dep/pkg/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/has-local-dir-dep/example/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/has-local-dir-dep/example/pnpm-lock.yaml index f4c8b00745..9b60ae1782 100644 --- a/pkg-manager/headless/test/fixtures/has-local-dir-dep/example/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/has-local-dir-dep/example/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/has-local-dir-dep/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/has-local-dir-dep/pnpm-lock.yaml index 86f8a77f07..355a018620 100644 --- a/pkg-manager/headless/test/fixtures/has-local-dir-dep/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/has-local-dir-dep/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/has-nonexistent-optional-dep/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/has-nonexistent-optional-dep/pnpm-lock.yaml index 0a4a3da818..b2c7500603 100644 --- a/pkg-manager/headless/test/fixtures/has-nonexistent-optional-dep/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/has-nonexistent-optional-dep/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/has-several-versions-of-same-pkg/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/has-several-versions-of-same-pkg/pnpm-lock.yaml index cbb7f6d80f..61c99b8483 100644 --- a/pkg-manager/headless/test/fixtures/has-several-versions-of-same-pkg/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/has-several-versions-of-same-pkg/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/ignore-package-manifest/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/ignore-package-manifest/pnpm-lock.yaml index ba5282b22c..8ddba07a22 100644 --- a/pkg-manager/headless/test/fixtures/ignore-package-manifest/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/ignore-package-manifest/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/prod-dep-is-dev-subdep/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/prod-dep-is-dev-subdep/pnpm-lock.yaml index 2f3bdfae9a..2b8b207806 100644 --- a/pkg-manager/headless/test/fixtures/prod-dep-is-dev-subdep/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/prod-dep-is-dev-subdep/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/reinstall-peer-deps/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/reinstall-peer-deps/pnpm-lock.yaml index 5d8788909e..428711fb04 100644 --- a/pkg-manager/headless/test/fixtures/reinstall-peer-deps/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/reinstall-peer-deps/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/resolved-peer-deps-in-subdeps/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/resolved-peer-deps-in-subdeps/pnpm-lock.yaml index 40af24e407..7e223ad67f 100644 --- a/pkg-manager/headless/test/fixtures/resolved-peer-deps-in-subdeps/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/resolved-peer-deps-in-subdeps/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: false diff --git a/pkg-manager/headless/test/fixtures/side-effects-of-subdep/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/side-effects-of-subdep/pnpm-lock.yaml index d0aabde163..8b694a7435 100644 --- a/pkg-manager/headless/test/fixtures/side-effects-of-subdep/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/side-effects-of-subdep/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/side-effects/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/side-effects/pnpm-lock.yaml index 4f4f1d18cb..1c582fd768 100644 --- a/pkg-manager/headless/test/fixtures/side-effects/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/side-effects/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/simple-shamefully-flatten/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/simple-shamefully-flatten/pnpm-lock.yaml index 5624d7677e..09a1865024 100644 --- a/pkg-manager/headless/test/fixtures/simple-shamefully-flatten/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/simple-shamefully-flatten/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: false diff --git a/pkg-manager/headless/test/fixtures/simple-with-more-deps/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/simple-with-more-deps/pnpm-lock.yaml index 4520111bfe..21e63cd91a 100644 --- a/pkg-manager/headless/test/fixtures/simple-with-more-deps/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/simple-with-more-deps/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/simple-with-optional-dep/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/simple-with-optional-dep/pnpm-lock.yaml index 702a03081e..157a5a57a1 100644 --- a/pkg-manager/headless/test/fixtures/simple-with-optional-dep/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/simple-with-optional-dep/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/simple/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/simple/pnpm-lock.yaml index ba5282b22c..8ddba07a22 100644 --- a/pkg-manager/headless/test/fixtures/simple/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/simple/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/with-1-dep/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/with-1-dep/pnpm-lock.yaml index 4519605009..b7cfaf6a86 100644 --- a/pkg-manager/headless/test/fixtures/with-1-dep/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/with-1-dep/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/headless/test/fixtures/workspace/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/workspace/pnpm-lock.yaml index c52dce8597..1f14c3cbf7 100644 --- a/pkg-manager/headless/test/fixtures/workspace/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/workspace/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' importers: diff --git a/pkg-manager/headless/test/fixtures/workspace2/pnpm-lock.yaml b/pkg-manager/headless/test/fixtures/workspace2/pnpm-lock.yaml index e34315eafd..e5a599e795 100644 --- a/pkg-manager/headless/test/fixtures/workspace2/pnpm-lock.yaml +++ b/pkg-manager/headless/test/fixtures/workspace2/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/pkg-manager/plugin-commands-installation/test/__snapshots__/dedupe.ts.snap b/pkg-manager/plugin-commands-installation/test/__snapshots__/dedupe.ts.snap index 9967c26c03..7f5401b007 100644 --- a/pkg-manager/plugin-commands-installation/test/__snapshots__/dedupe.ts.snap +++ b/pkg-manager/plugin-commands-installation/test/__snapshots__/dedupe.ts.snap @@ -15,7 +15,7 @@ exports[`pnpm dedupe updates old resolutions from importers block and removes ol }, @@ -20,31 +20,16 @@ }, - "lockfileVersion": "7.0", + "lockfileVersion": "9.0", "packages": Object { - "ajv@6.10.2": Object { - "resolution": Object { @@ -116,7 +116,7 @@ exports[`pnpm dedupe updates old resolutions from package block 1`] = ` @@ -20,14 +20,6 @@ }, - "lockfileVersion": "7.0", + "lockfileVersion": "9.0", "packages": Object { - "punycode@2.1.1": Object { - "engines": Object { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b566a014f2..dc5ac547d1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6360,7 +6360,7 @@ importers: version: link:../fs/symlink-dependency '@rushstack/worker-pool': specifier: 0.4.9 - version: 0.4.9(@types/node@20.11.30) + version: 0.4.9(@types/node@18.19.26) load-json-file: specifier: ^6.2.0 version: 6.2.0 @@ -7891,9 +7891,6 @@ packages: '@types/node@18.19.26': resolution: {integrity: sha512-+wiMJsIwLOYCvUqSdKTrfkS8mpTp+MPINe6+Np4TAGFWWRWiBQ5kSq9nZGCSPkzx9mvT+uEukzpX4MOSCydcvw==} - '@types/node@20.11.30': - resolution: {integrity: sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==} - '@types/node@20.5.1': resolution: {integrity: sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg==} @@ -14475,9 +14472,9 @@ snapshots: '@reflink/reflink-win32-arm64-msvc': 0.1.16 '@reflink/reflink-win32-x64-msvc': 0.1.16 - '@rushstack/worker-pool@0.4.9(@types/node@20.11.30)': + '@rushstack/worker-pool@0.4.9(@types/node@18.19.26)': dependencies: - '@types/node': 20.11.30 + '@types/node': 18.19.26 '@sinclair/typebox@0.27.8': {} @@ -14663,10 +14660,6 @@ snapshots: dependencies: undici-types: 5.26.5 - '@types/node@20.11.30': - dependencies: - undici-types: 5.26.5 - '@types/node@20.5.1': {} '@types/normalize-package-data@2.4.4': {} diff --git a/pnpm/CHANGELOG.md b/pnpm/CHANGELOG.md index 11a810ac72..9cee917ce6 100644 --- a/pnpm/CHANGELOG.md +++ b/pnpm/CHANGELOG.md @@ -5,7 +5,7 @@ ### Major Changes - Node.js v16 support dropped. Use at least Node.js v18.12. -- Lockfile version bumped to v7. +- Lockfile version bumped to v9. - Support for lockfile v5 is dropped. Use pnpm v8 to convert lockfile v5 to lockfile v6 [#7470](https://github.com/pnpm/pnpm/pull/7470). - The [`dedupe-injected-deps`](https://pnpm.io/npmrc#dedupe-injected-deps) setting is `true` by default. - The default value of the `link-workspace-packages` setting changed from `true` to `false`. This means that by default, dependencies will be linked from workspace packages only when they are specified using the [workspace protocol](https://pnpm.io/workspaces#workspace-protocol-workspace). diff --git a/pnpm/test/install/hooks.ts b/pnpm/test/install/hooks.ts index 01638256c8..a6fab7f370 100644 --- a/pnpm/test/install/hooks.ts +++ b/pnpm/test/install/hooks.ts @@ -1,6 +1,6 @@ import fs from 'fs' import path from 'path' -import { type LockfileV7 as Lockfile } from '@pnpm/lockfile-types' +import { type LockfileV9 as Lockfile } from '@pnpm/lockfile-types' import { prepare, preparePackages } from '@pnpm/prepare' import { sync as readYamlFile } from 'read-yaml-file' import loadJsonFile from 'load-json-file' diff --git a/pnpm/test/monorepo/dedupePeers.test.ts b/pnpm/test/monorepo/dedupePeers.test.ts index c2d8377ced..01cf76c078 100644 --- a/pnpm/test/monorepo/dedupePeers.test.ts +++ b/pnpm/test/monorepo/dedupePeers.test.ts @@ -1,7 +1,7 @@ import fs from 'fs' import path from 'path' import { WANTED_LOCKFILE } from '@pnpm/constants' -import { type LockfileV7 as Lockfile } from '@pnpm/lockfile-types' +import { type LockfileV9 as Lockfile } from '@pnpm/lockfile-types' import { preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' import { sync as readYamlFile } from 'read-yaml-file' diff --git a/pnpm/test/monorepo/peerDependencies.ts b/pnpm/test/monorepo/peerDependencies.ts index 3e383d78fd..02d9630690 100644 --- a/pnpm/test/monorepo/peerDependencies.ts +++ b/pnpm/test/monorepo/peerDependencies.ts @@ -1,6 +1,6 @@ import fs from 'fs' import { WANTED_LOCKFILE } from '@pnpm/constants' -import { type LockfileV7 as Lockfile } from '@pnpm/lockfile-types' +import { type LockfileV9 as Lockfile } from '@pnpm/lockfile-types' import { preparePackages } from '@pnpm/prepare' import { sync as readYamlFile } from 'read-yaml-file' import { sync as writeYamlFile } from 'write-yaml-file' diff --git a/pnpm/test/recursive/misc.ts b/pnpm/test/recursive/misc.ts index a00cea3033..9f56cadcef 100644 --- a/pnpm/test/recursive/misc.ts +++ b/pnpm/test/recursive/misc.ts @@ -1,7 +1,7 @@ import fs from 'fs' import path from 'path' import { prepare, preparePackages } from '@pnpm/prepare' -import { type LockfileV7 as Lockfile } from '@pnpm/lockfile-types' +import { type LockfileV9 as Lockfile } from '@pnpm/lockfile-types' import { sync as readYamlFile } from 'read-yaml-file' import { isCI } from 'ci-info' import isWindows from 'is-windows' diff --git a/reviewing/plugin-commands-licenses/test/fixtures/complex-licenses/pnpm-lock.yaml b/reviewing/plugin-commands-licenses/test/fixtures/complex-licenses/pnpm-lock.yaml index 1ced0c8642..eccff3c8bc 100644 --- a/reviewing/plugin-commands-licenses/test/fixtures/complex-licenses/pnpm-lock.yaml +++ b/reviewing/plugin-commands-licenses/test/fixtures/complex-licenses/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/reviewing/plugin-commands-licenses/test/fixtures/file-mode-test/pnpm-lock.yaml b/reviewing/plugin-commands-licenses/test/fixtures/file-mode-test/pnpm-lock.yaml index 61f44c871f..8dadba6166 100644 --- a/reviewing/plugin-commands-licenses/test/fixtures/file-mode-test/pnpm-lock.yaml +++ b/reviewing/plugin-commands-licenses/test/fixtures/file-mode-test/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/reviewing/plugin-commands-licenses/test/fixtures/simple-licenses/pnpm-lock.yaml b/reviewing/plugin-commands-licenses/test/fixtures/simple-licenses/pnpm-lock.yaml index 97cdea9ee6..c1d6d9dcad 100644 --- a/reviewing/plugin-commands-licenses/test/fixtures/simple-licenses/pnpm-lock.yaml +++ b/reviewing/plugin-commands-licenses/test/fixtures/simple-licenses/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/reviewing/plugin-commands-licenses/test/fixtures/with-dev-dependency/pnpm-lock.yaml b/reviewing/plugin-commands-licenses/test/fixtures/with-dev-dependency/pnpm-lock.yaml index ced140ed49..a0b59d4311 100644 --- a/reviewing/plugin-commands-licenses/test/fixtures/with-dev-dependency/pnpm-lock.yaml +++ b/reviewing/plugin-commands-licenses/test/fixtures/with-dev-dependency/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/reviewing/plugin-commands-licenses/test/fixtures/with-file-protocol/pnpm-lock.yaml b/reviewing/plugin-commands-licenses/test/fixtures/with-file-protocol/pnpm-lock.yaml index 095f696fb2..c3732f99ad 100644 --- a/reviewing/plugin-commands-licenses/test/fixtures/with-file-protocol/pnpm-lock.yaml +++ b/reviewing/plugin-commands-licenses/test/fixtures/with-file-protocol/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/reviewing/plugin-commands-licenses/test/fixtures/with-file-protocol/sub-dep/pnpm-lock.yaml b/reviewing/plugin-commands-licenses/test/fixtures/with-file-protocol/sub-dep/pnpm-lock.yaml index f4c8b00745..9b60ae1782 100644 --- a/reviewing/plugin-commands-licenses/test/fixtures/with-file-protocol/sub-dep/pnpm-lock.yaml +++ b/reviewing/plugin-commands-licenses/test/fixtures/with-file-protocol/sub-dep/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/reviewing/plugin-commands-licenses/test/fixtures/with-git-protocol-caps/pnpm-lock.yaml b/reviewing/plugin-commands-licenses/test/fixtures/with-git-protocol-caps/pnpm-lock.yaml index 5cd98a18f1..5b87c4511d 100644 --- a/reviewing/plugin-commands-licenses/test/fixtures/with-git-protocol-caps/pnpm-lock.yaml +++ b/reviewing/plugin-commands-licenses/test/fixtures/with-git-protocol-caps/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/reviewing/plugin-commands-licenses/test/fixtures/with-git-protocol-patched-deps/pnpm-lock.yaml b/reviewing/plugin-commands-licenses/test/fixtures/with-git-protocol-patched-deps/pnpm-lock.yaml index db9e68a833..f11b00ac0b 100644 --- a/reviewing/plugin-commands-licenses/test/fixtures/with-git-protocol-patched-deps/pnpm-lock.yaml +++ b/reviewing/plugin-commands-licenses/test/fixtures/with-git-protocol-patched-deps/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/reviewing/plugin-commands-licenses/test/fixtures/workspace-licenses/bar/pnpm-lock.yaml b/reviewing/plugin-commands-licenses/test/fixtures/workspace-licenses/bar/pnpm-lock.yaml index 14066d2906..3f570f463a 100644 --- a/reviewing/plugin-commands-licenses/test/fixtures/workspace-licenses/bar/pnpm-lock.yaml +++ b/reviewing/plugin-commands-licenses/test/fixtures/workspace-licenses/bar/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/reviewing/plugin-commands-licenses/test/fixtures/workspace-licenses/foo/pnpm-lock.yaml b/reviewing/plugin-commands-licenses/test/fixtures/workspace-licenses/foo/pnpm-lock.yaml index fbf67b6f89..4813d07c96 100644 --- a/reviewing/plugin-commands-licenses/test/fixtures/workspace-licenses/foo/pnpm-lock.yaml +++ b/reviewing/plugin-commands-licenses/test/fixtures/workspace-licenses/foo/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true diff --git a/reviewing/plugin-commands-licenses/test/fixtures/workspace-licenses/pnpm-lock.yaml b/reviewing/plugin-commands-licenses/test/fixtures/workspace-licenses/pnpm-lock.yaml index f4c8b00745..9b60ae1782 100644 --- a/reviewing/plugin-commands-licenses/test/fixtures/workspace-licenses/pnpm-lock.yaml +++ b/reviewing/plugin-commands-licenses/test/fixtures/workspace-licenses/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '7.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true