mirror of
https://github.com/pnpm/pnpm.git
synced 2026-05-14 03:26:13 -04:00
* chore: upgrade @typescript/native-preview to 7.0.0-dev.20260421.2
- Add explicit `types: ["node"]` to the shared tsconfig because tsgo
20260421 no longer auto-acquires `@types/*` from `node_modules`.
- Refactor test files to explicitly import jest globals (`describe`,
`it`, `test`, `expect`, `beforeEach`, etc.) from `@jest/globals`
instead of relying on `@types/jest` ambient declarations. Under the
new tsgo build, `import { jest } from '@jest/globals'` shadows the
ambient `jest` namespace, breaking `@types/jest`'s `declare var
describe: jest.Describe;` globals.
- Add `@jest/globals` to each package's devDependencies where tests
now import from it, and add `@types/node` to packages that need it
but were relying on hoisted resolution.
- Replace `fail()` calls with `throw new Error(...)` since `fail` is
no longer globally available.
* chore: fix remaining tsgo type-strictness errors
- Strip `as <PnpmType>` casts on objects passed to toMatchObject /
toStrictEqual / toEqual; @jest/globals rejects the typed objects
(which include AsymmetricMatchers) vs. the repo-specific type.
- Type `jest.fn<...>()` explicitly where the mock's signature matters
for toHaveBeenCalledWith.
- Replace `beforeEach(() => X)` with `beforeEach(() => { X })` so the
return value is void, as the stricter jest typing requires.
- Use `expect.objectContaining({...})` in one place where the full
expected object triggered stricter type resolution.
- Cast `prompt.mock.calls` arg through `as unknown as Record<...>[]`
for patch.test.ts's nested-array matchers.
- Fix off-by-one `<reference path>` in pnpm/test/getConfig.test.ts
that only surfaced now.
- Move `@jest/globals` from devDependencies to dependencies in the
two `__utils__` packages that import it from `src/`.
- Clean up unused imports from the @jest/globals migration.
* chore: address Copilot review on #11332
- Move misplaced `@jest/globals` imports to the top import block in
checkEngine, run.ts, and workspace/root-finder tests where the
script dropped them below executable code.
- Replace `try { await x(); throw new Error('should have thrown') } catch`
in bins/linker, lockfile/fs, and resolving/local-resolver tests with
`await expect(x()).rejects.toMatchObject({...})`. The old pattern
swallowed an unrelated `throw` if the under-test call silently
succeeded, which would fail on the catch-block assertion with a
misleading message.
306 lines
8.0 KiB
TypeScript
306 lines
8.0 KiB
TypeScript
import path from 'node:path'
|
|
|
|
import { expect, jest, test } from '@jest/globals'
|
|
import type { DepPath, ProjectId } from '@pnpm/types'
|
|
import { temporaryDirectory } from 'tempy'
|
|
|
|
jest.unstable_mockModule('@pnpm/network.git-utils', () => ({ getCurrentBranch: jest.fn() }))
|
|
|
|
const { getCurrentBranch } = await import('@pnpm/network.git-utils')
|
|
const {
|
|
existsNonEmptyWantedLockfile,
|
|
readCurrentLockfile,
|
|
readWantedLockfile,
|
|
writeCurrentLockfile,
|
|
writeWantedLockfile,
|
|
} = await import('@pnpm/lockfile.fs')
|
|
|
|
process.chdir(import.meta.dirname)
|
|
|
|
test('readWantedLockfile()', async () => {
|
|
{
|
|
const lockfile = await readWantedLockfile(path.join('fixtures', '2'), {
|
|
ignoreIncompatible: false,
|
|
})
|
|
expect(lockfile?.lockfileVersion).toBe('9.0')
|
|
expect(lockfile?.importers).toStrictEqual({
|
|
'.': {
|
|
dependencies: {
|
|
foo: '1.0.0',
|
|
},
|
|
devDependencies: undefined,
|
|
optionalDependencies: undefined,
|
|
specifiers: {
|
|
foo: '1',
|
|
},
|
|
dependenciesMeta: {
|
|
foo: { injected: true },
|
|
},
|
|
},
|
|
})
|
|
}
|
|
|
|
await expect(
|
|
readWantedLockfile(path.join('fixtures', '3'), {
|
|
ignoreIncompatible: false,
|
|
wantedVersions: ['3'],
|
|
})
|
|
).rejects.toMatchObject({ code: 'ERR_PNPM_LOCKFILE_BREAKING_CHANGE' })
|
|
})
|
|
|
|
test('readWantedLockfile() when lockfileVersion is a string', async () => {
|
|
{
|
|
const lockfile = await readWantedLockfile(path.join('fixtures', '4'), {
|
|
ignoreIncompatible: false,
|
|
wantedVersions: ['3'],
|
|
})
|
|
expect(lockfile!.lockfileVersion).toBe('v3')
|
|
}
|
|
|
|
{
|
|
const lockfile = await readWantedLockfile(path.join('fixtures', '5'), {
|
|
ignoreIncompatible: false,
|
|
wantedVersions: ['3'],
|
|
})
|
|
expect(lockfile!.lockfileVersion).toBe('3')
|
|
}
|
|
})
|
|
|
|
test('readCurrentLockfile()', async () => {
|
|
const lockfile = await readCurrentLockfile('fixtures/2/node_modules/.pnpm', {
|
|
ignoreIncompatible: false,
|
|
})
|
|
expect(lockfile!.lockfileVersion).toBe('6.0')
|
|
})
|
|
|
|
test('writeWantedLockfile()', async () => {
|
|
const projectPath = temporaryDirectory()
|
|
const wantedLockfile = {
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'is-negative': '1.0.0',
|
|
'is-positive': '1.0.0',
|
|
},
|
|
specifiers: {
|
|
'is-negative': '^1.0.0',
|
|
'is-positive': '^1.0.0',
|
|
},
|
|
},
|
|
},
|
|
lockfileVersion: '9.0',
|
|
packages: {
|
|
'is-negative@1.0.0': {
|
|
dependencies: {
|
|
'is-positive': '2.0.0',
|
|
},
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
'is-positive@1.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
'is-positive@2.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
},
|
|
registry: 'https://registry.npmjs.org',
|
|
}
|
|
await writeWantedLockfile(projectPath, wantedLockfile)
|
|
expect(await readCurrentLockfile(projectPath, { ignoreIncompatible: false })).toBeNull()
|
|
expect(await readWantedLockfile(projectPath, { ignoreIncompatible: false })).toEqual(wantedLockfile)
|
|
})
|
|
|
|
test('writeCurrentLockfile()', async () => {
|
|
const projectPath = temporaryDirectory()
|
|
const wantedLockfile = {
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'is-negative': '1.0.0',
|
|
'is-positive': '1.0.0',
|
|
},
|
|
specifiers: {
|
|
'is-negative': '^1.0.0',
|
|
'is-positive': '^1.0.0',
|
|
},
|
|
},
|
|
},
|
|
lockfileVersion: '9.0',
|
|
packages: {
|
|
'is-negative@1.0.0': {
|
|
dependencies: {
|
|
'is-positive': '2.0.0',
|
|
},
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
'is-positive@1.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
'is-positive@2.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
},
|
|
registry: 'https://registry.npmjs.org',
|
|
}
|
|
await writeCurrentLockfile(projectPath, wantedLockfile)
|
|
expect(await readWantedLockfile(projectPath, { ignoreIncompatible: false })).toBeNull()
|
|
expect(await readCurrentLockfile(projectPath, { ignoreIncompatible: false })).toEqual(wantedLockfile)
|
|
})
|
|
|
|
test('existsNonEmptyWantedLockfile()', async () => {
|
|
const projectPath = temporaryDirectory()
|
|
expect(await existsNonEmptyWantedLockfile(projectPath)).toBe(false)
|
|
await writeWantedLockfile(projectPath, {
|
|
importers: {
|
|
['.' as ProjectId]: {
|
|
dependencies: {
|
|
'is-negative': '1.0.0',
|
|
'is-positive': '1.0.0',
|
|
},
|
|
specifiers: {
|
|
'is-negative': '^1.0.0',
|
|
'is-positive': '^1.0.0',
|
|
},
|
|
},
|
|
},
|
|
lockfileVersion: '3',
|
|
packages: {
|
|
['is-negative/1.0.0' as DepPath]: {
|
|
dependencies: {
|
|
'is-positive': '2.0.0',
|
|
},
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
['is-positive/1.0.0' as DepPath]: {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
['is-positive/2.0.0' as DepPath]: {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
},
|
|
})
|
|
expect(await existsNonEmptyWantedLockfile(projectPath)).toBe(true)
|
|
})
|
|
|
|
test('readWantedLockfile() when useGitBranchLockfile', async () => {
|
|
jest.mocked(getCurrentBranch).mockReturnValue(Promise.resolve('branch'))
|
|
const lockfile = await readWantedLockfile(path.join('fixtures', '6'), {
|
|
ignoreIncompatible: false,
|
|
})
|
|
expect(lockfile?.importers).toEqual({
|
|
'.': {
|
|
dependencies: {
|
|
'is-positive': '1.0.0',
|
|
},
|
|
specifiers: {
|
|
'is-positive': '1.0.0',
|
|
},
|
|
},
|
|
})
|
|
expect(lockfile?.packages).toStrictEqual({
|
|
'is-positive@1.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
})
|
|
|
|
const gitBranchLockfile = await readWantedLockfile(path.join('fixtures', '6'), {
|
|
ignoreIncompatible: false,
|
|
useGitBranchLockfile: true,
|
|
})
|
|
expect(gitBranchLockfile?.importers).toEqual({
|
|
'.': {
|
|
dependencies: {
|
|
'is-positive': '2.0.0',
|
|
},
|
|
specifiers: {
|
|
'is-positive': '2.0.0',
|
|
},
|
|
},
|
|
})
|
|
expect(gitBranchLockfile?.packages).toStrictEqual({
|
|
'is-positive@2.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
})
|
|
})
|
|
|
|
test('readWantedLockfile() when useGitBranchLockfile and mergeGitBranchLockfiles', async () => {
|
|
jest.mocked(getCurrentBranch).mockReturnValue(Promise.resolve('branch'))
|
|
const lockfile = await readWantedLockfile(path.join('fixtures', '6'), {
|
|
ignoreIncompatible: false,
|
|
useGitBranchLockfile: true,
|
|
mergeGitBranchLockfiles: true,
|
|
})
|
|
expect(lockfile?.importers).toEqual({
|
|
'.': {
|
|
dependencies: {
|
|
'is-positive': '2.0.0',
|
|
},
|
|
specifiers: {
|
|
'is-positive': '2.0.0',
|
|
},
|
|
},
|
|
})
|
|
expect(lockfile?.packages).toStrictEqual({
|
|
'is-positive@1.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
'is-positive@2.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
})
|
|
})
|
|
|
|
test('readWantedLockfile() with inlineSpecifiersFormat', async () => {
|
|
const wantedLockfile = {
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'is-positive': '1.0.0',
|
|
},
|
|
specifiers: {
|
|
'is-positive': '^1.0.0',
|
|
},
|
|
},
|
|
},
|
|
packages: {
|
|
'is-positive@1.0.0': {
|
|
resolution: {
|
|
integrity: 'sha1-ChbBDewTLAqLCzb793Fo5VDvg/g=',
|
|
},
|
|
},
|
|
},
|
|
registry: 'https://registry.npmjs.org',
|
|
}
|
|
|
|
const lockfile = await readWantedLockfile(path.join('fixtures', '7'), { ignoreIncompatible: false })
|
|
expect(lockfile?.importers).toEqual(wantedLockfile.importers)
|
|
expect(lockfile?.packages).toEqual(wantedLockfile.packages)
|
|
})
|