Files
pnpm/installing/deps-installer/test/install/gitBranchLockfile.test.ts
Zoltan Kochan 74a2dc9027 feat(installing): delegate resolution to pacquet >= 0.11.7 when configured (#12210)
* feat(installing): delegate resolution to pacquet >= 0.11 when configured

When pacquet is declared in configDependencies, pnpm previously always
ran it with --frozen-lockfile (pnpm resolved, pacquet materialized). If
the installed pacquet is >= 0.11 it ships its own resolver, so a
non-frozen plain install on the default isolated linker is now delegated
end-to-end: pacquet resolves, writes pnpm-lock.yaml, and materializes in
a single pass. Older pacquet keeps the resolve-then-materialize split,
and add/update/remove still resolve in pnpm.

* test(pnpm): cover pacquet 0.11 resolution delegation end-to-end

Bump the e2e pacquet pin to 0.11.0 (published under both pacquet and
@pnpm/pacquet) and add tests for the resolve path, the materialize-only
fallback (pinned to 0.2.14), and the scoped alias. Un-skip the add/update
tests now that pacquet 0.11 writes a compatible .modules.yaml, and fix
the update test (is-positive has no v4; update from 1.0.0 instead).

Also preserve the configDependencies env document when pacquet resolves:
pacquet rewrites pnpm-lock.yaml without the leading env YAML doc, which
dropped configDependencies and broke the next --frozen-lockfile install.
Capture it before delegating and restore it after.

* fix(installing): restore configDependencies env document even when pacquet fails

On the pacquet resolve-delegation path the configDependencies env document
was only restored after a successful pacquet run. A non-zero exit could
leave a rewritten pnpm-lock.yaml without it, breaking the next
--frozen-lockfile install's config-deps freshness gate. Restore it in a
finally block, swallowing (and warning on) any restore error so it cannot
mask the original pacquet failure.

* fix(installing): require pacquet 0.11.7 for resolving installs

* fix(installing): skip pacquet in lockfile check mode

* fix(installing): harden pacquet lockfile handoff

* fix(installing): preserve policy handling with pacquet

* fix(installing): skip pacquet when lockfile is disabled

* fix(installing): skip pacquet with branch lockfiles
2026-06-14 16:51:25 +02:00

275 lines
7.4 KiB
TypeScript

import fs from 'node:fs'
import path from 'node:path'
import { expect, jest, test } from '@jest/globals'
import { LOCKFILE_VERSION, WANTED_LOCKFILE } from '@pnpm/constants'
import { prepareEmpty, preparePackages } from '@pnpm/prepare'
import type { ProjectManifest, ProjectRootDir } from '@pnpm/types'
import { writeYamlFileSync } from 'write-yaml-file'
import { testDefaults } from '../utils/index.js'
jest.unstable_mockModule('@pnpm/network.git-utils', () => ({ getCurrentBranch: jest.fn() }))
const { getCurrentBranch } = await import('@pnpm/network.git-utils')
const { install, mutateModules } = await import('@pnpm/installing.deps-installer')
test('install with git-branch-lockfile = true', async () => {
prepareEmpty()
const branchName: string = 'main-branch'
jest.mocked(getCurrentBranch).mockReturnValue(Promise.resolve(branchName))
const opts = testDefaults({
useGitBranchLockfile: true,
})
await install({
dependencies: {
'is-positive': '^3.0.0',
},
}, opts)
expect(fs.existsSync(`pnpm-lock.${branchName}.yaml`)).toBe(true)
expect(fs.existsSync(WANTED_LOCKFILE)).toBe(false)
})
test('git-branch-lockfile installs are not delegated to pacquet', async () => {
prepareEmpty()
const branchName: string = 'main-branch'
jest.mocked(getCurrentBranch).mockReturnValue(Promise.resolve(branchName))
const runPacquet = jest.fn<() => Promise<void>>().mockResolvedValue(undefined)
await install({
dependencies: {
'is-positive': '^3.0.0',
},
}, testDefaults({
runPacquet: {
supportsResolution: true,
run: runPacquet,
},
useGitBranchLockfile: true,
}))
expect(runPacquet).not.toHaveBeenCalled()
expect(fs.existsSync(`pnpm-lock.${branchName}.yaml`)).toBe(true)
expect(fs.existsSync(WANTED_LOCKFILE)).toBe(false)
})
test('install with git-branch-lockfile = true and no lockfile changes', async () => {
prepareEmpty()
const branchName: string = 'main-branch'
jest.mocked(getCurrentBranch).mockReturnValue(Promise.resolve(branchName))
const manifest: ProjectManifest = {
dependencies: {
'is-positive': '^3.0.0',
},
}
const opts1 = testDefaults({
useGitBranchLockfile: false,
})
await install(manifest, opts1)
expect(fs.existsSync(WANTED_LOCKFILE)).toBe(true)
const opts2 = testDefaults({
useGitBranchLockfile: true,
})
await install(manifest, opts2)
expect(fs.existsSync(WANTED_LOCKFILE)).toBe(true)
// Git branch lockfile is created only if there are changes in the lockfile
expect(fs.existsSync(`pnpm-lock.${branchName}.yaml`)).toBe(false)
})
test('install a workspace with git-branch-lockfile = true', async () => {
const rootManifest: ProjectManifest = {
name: 'root',
}
const project1Manifest: ProjectManifest = {
name: 'project-1',
dependencies: { 'is-positive': '1.0.0' },
}
const project2Manifest: ProjectManifest = {
name: 'project-2',
dependencies: { 'is-positive': '1.0.0' },
}
preparePackages([
{
location: '.',
package: rootManifest,
},
{
location: 'project-1',
package: project1Manifest,
},
{
location: 'project-2',
package: project2Manifest,
},
])
const branchName: string = 'main-branch'
jest.mocked(getCurrentBranch).mockReturnValue(Promise.resolve(branchName))
const opts = testDefaults({
useGitBranchLockfile: true,
allProjects: [
{
buildIndex: 0,
manifest: rootManifest,
rootDir: process.cwd() as ProjectRootDir,
},
{
buildIndex: 0,
manifest: project1Manifest,
rootDir: path.resolve('project-1') as ProjectRootDir,
},
{
buildIndex: 0,
manifest: project2Manifest,
rootDir: path.resolve('project-2') as ProjectRootDir,
},
],
})
await mutateModules([
{
mutation: 'install',
rootDir: process.cwd() as ProjectRootDir,
},
{
mutation: 'install',
rootDir: path.resolve('project-1') as ProjectRootDir,
},
{
mutation: 'install',
rootDir: path.resolve('project-2') as ProjectRootDir,
},
], opts)
expect(fs.existsSync(`pnpm-lock.${branchName}.yaml`)).toBe(true)
expect(fs.existsSync(WANTED_LOCKFILE)).toBe(false)
})
test('install with --merge-git-branch-lockfiles', async () => {
prepareEmpty()
const branchName: string = 'main-branch'
jest.mocked(getCurrentBranch).mockReturnValue(Promise.resolve(branchName))
const otherLockfilePath: string = path.resolve('pnpm-lock.other.yaml')
writeYamlFileSync(otherLockfilePath, {
whatever: 'whatever',
})
expect(fs.existsSync(otherLockfilePath)).toBe(true)
expect(fs.existsSync(WANTED_LOCKFILE)).toBe(false)
const opts = testDefaults({
useGitBranchLockfile: true,
mergeGitBranchLockfiles: true,
})
await install({
dependencies: {
'is-positive': '^3.0.0',
},
}, opts)
expect(fs.existsSync(otherLockfilePath)).toBe(false)
expect(fs.existsSync(WANTED_LOCKFILE)).toBe(true)
})
test('install with --merge-git-branch-lockfiles when merged lockfile is up to date', async () => {
const project = prepareEmpty()
// @types/semver installed in the main branch
writeYamlFileSync(WANTED_LOCKFILE, {
importers: {
'.': {
dependencies: {
'@types/semver': {
specifier: '5.3.31',
version: '5.3.31',
},
},
},
},
lockfileVersion: LOCKFILE_VERSION,
packages: {
'@types/semver@5.3.31': {
resolution: {
integrity: 'sha512-WBv5F9HrWTyG800cB9M3veCVkFahqXN7KA7c3VUCYZm/xhNzzIFiXiq+rZmj75j7GvWelN3YNrLX7FjtqBvhMw==',
},
},
},
snapshots: {
'@types/semver@5.3.31': {},
},
}, { lineWidth: 1000 })
const branchName: string = 'main-branch'
jest.mocked(getCurrentBranch).mockReturnValue(Promise.resolve(branchName))
// is-positive installed in the other branch
const otherLockfilePath: string = path.resolve('pnpm-lock.other.yaml')
const otherLockfileContent = {
importers: {
'.': {
dependencies: {
'@types/semver': {
specifier: '5.3.31',
version: '5.3.31',
},
'is-positive': {
specifier: '^3.1.0',
version: '3.1.0',
},
},
},
},
lockfileVersion: LOCKFILE_VERSION,
packages: {
'@types/semver@5.3.31': {
resolution: {
integrity: 'sha512-WBv5F9HrWTyG800cB9M3veCVkFahqXN7KA7c3VUCYZm/xhNzzIFiXiq+rZmj75j7GvWelN3YNrLX7FjtqBvhMw==',
},
},
'is-positive@3.1.0': {
resolution: {
integrity: 'sha512-8ND1j3y9/HP94TOvGzr69/FgbkX2ruOldhLEsTWwcJVfo4oRjwemJmJxt7RJkKYH8tz7vYBP9JcKQY8CLuJ90Q==',
},
},
},
snapshots: {
'@types/semver@5.3.31': {},
'is-positive@3.1.0': {},
},
}
writeYamlFileSync(otherLockfilePath, otherLockfileContent, { lineWidth: 1000 })
// the other branch merged to the main branch
const projectManifest: ProjectManifest = {
dependencies: {
'@types/semver': '5.3.31',
'is-positive': '^3.1.0',
},
}
const opts = testDefaults({
useGitBranchLockfile: true,
mergeGitBranchLockfiles: true,
frozenLockfile: true,
})
await install(projectManifest, opts)
expect(fs.existsSync(otherLockfilePath)).toBe(false)
expect(fs.existsSync(WANTED_LOCKFILE)).toBe(true)
const wantedLockfileAfterMergeOther = project.readLockfile()
expect(wantedLockfileAfterMergeOther).toEqual(otherLockfileContent)
})