mirror of
https://github.com/pnpm/pnpm.git
synced 2026-07-25 07:03:03 -04:00
187049055f
* 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.
127 lines
4.1 KiB
TypeScript
127 lines
4.1 KiB
TypeScript
import { expect, jest, test } from '@jest/globals'
|
|
import { LOCKFILE_VERSION } from '@pnpm/constants'
|
|
import {
|
|
addDependenciesToPackage,
|
|
type PackageManifest,
|
|
} from '@pnpm/installing.deps-installer'
|
|
import type { LockfileObject } from '@pnpm/lockfile.fs'
|
|
import { prepareEmpty } from '@pnpm/prepare'
|
|
import { addDistTag } from '@pnpm/registry-mock'
|
|
|
|
import { testDefaults } from '../utils/index.js'
|
|
|
|
test('readPackage, afterAllResolved hooks', async () => {
|
|
const project = prepareEmpty()
|
|
|
|
// w/o the hook, 100.1.0 would be installed
|
|
await addDistTag({ package: '@pnpm.e2e/dep-of-pkg-with-1-dep', version: '100.1.0', distTag: 'latest' })
|
|
|
|
function readPackageHook (manifest: PackageManifest) {
|
|
switch (manifest.name) {
|
|
case '@pnpm.e2e/pkg-with-1-dep':
|
|
if (manifest.dependencies == null) {
|
|
throw new Error('@pnpm.e2e/pkg-with-1-dep expected to have a dependencies field')
|
|
}
|
|
manifest.dependencies['@pnpm.e2e/dep-of-pkg-with-1-dep'] = '100.0.0'
|
|
break
|
|
}
|
|
return manifest
|
|
}
|
|
|
|
const afterAllResolved = jest.fn((lockfile: LockfileObject) => {
|
|
Object.assign(lockfile, { foo: 'foo' })
|
|
return lockfile
|
|
})
|
|
|
|
await addDependenciesToPackage({}, ['@pnpm.e2e/pkg-with-1-dep'], testDefaults({
|
|
hooks: {
|
|
afterAllResolved: [afterAllResolved],
|
|
readPackage: [readPackageHook],
|
|
},
|
|
}))
|
|
|
|
project.storeHas('@pnpm.e2e/dep-of-pkg-with-1-dep', '100.0.0')
|
|
expect(afterAllResolved).toHaveBeenCalledTimes(1)
|
|
expect(afterAllResolved.mock.calls[0][0].lockfileVersion).toEqual(LOCKFILE_VERSION)
|
|
|
|
const wantedLockfile = project.readLockfile()
|
|
expect(wantedLockfile).toHaveProperty(['foo'], 'foo')
|
|
})
|
|
|
|
test('readPackage, afterAllResolved async hooks', async () => {
|
|
const project = prepareEmpty()
|
|
|
|
// w/o the hook, 100.1.0 would be installed
|
|
await addDistTag({ package: '@pnpm.e2e/dep-of-pkg-with-1-dep', version: '100.1.0', distTag: 'latest' })
|
|
|
|
async function readPackageHook (manifest: PackageManifest) {
|
|
switch (manifest.name) {
|
|
case '@pnpm.e2e/pkg-with-1-dep':
|
|
if (manifest.dependencies == null) {
|
|
throw new Error('@pnpm.e2e/pkg-with-1-dep expected to have a dependencies field')
|
|
}
|
|
manifest.dependencies['@pnpm.e2e/dep-of-pkg-with-1-dep'] = '100.0.0'
|
|
break
|
|
}
|
|
return manifest
|
|
}
|
|
|
|
const afterAllResolved = jest.fn(async (lockfile: LockfileObject) => {
|
|
Object.assign(lockfile, { foo: 'foo' })
|
|
return lockfile
|
|
})
|
|
|
|
await addDependenciesToPackage({}, ['@pnpm.e2e/pkg-with-1-dep'], testDefaults({
|
|
hooks: {
|
|
afterAllResolved: [afterAllResolved],
|
|
readPackage: [readPackageHook],
|
|
},
|
|
}))
|
|
|
|
project.storeHas('@pnpm.e2e/dep-of-pkg-with-1-dep', '100.0.0')
|
|
expect(afterAllResolved).toHaveBeenCalledTimes(1)
|
|
expect(afterAllResolved.mock.calls[0][0].lockfileVersion).toEqual(LOCKFILE_VERSION)
|
|
|
|
const wantedLockfile = project.readLockfile()
|
|
expect(wantedLockfile).toHaveProperty(['foo'], 'foo')
|
|
})
|
|
|
|
test('readPackage hooks array', async () => {
|
|
const project = prepareEmpty()
|
|
|
|
// w/o the hook, 100.1.0 would be installed
|
|
await addDistTag({ package: '@pnpm.e2e/dep-of-pkg-with-1-dep', version: '100.1.0', distTag: 'latest' })
|
|
|
|
function readPackageHook1 (manifest: PackageManifest) {
|
|
switch (manifest.name) {
|
|
case '@pnpm.e2e/pkg-with-1-dep':
|
|
if (manifest.dependencies == null) {
|
|
throw new Error('@pnpm.e2e/pkg-with-1-dep expected to have a dependencies field')
|
|
}
|
|
manifest.dependencies['@pnpm.e2e/dep-of-pkg-with-1-dep'] = '50.0.0'
|
|
break
|
|
}
|
|
return manifest
|
|
}
|
|
|
|
function readPackageHook2 (manifest: PackageManifest) {
|
|
switch (manifest.name) {
|
|
case '@pnpm.e2e/pkg-with-1-dep':
|
|
if (manifest.dependencies == null) {
|
|
throw new Error('@pnpm.e2e/pkg-with-1-dep expected to have a dependencies field')
|
|
}
|
|
manifest.dependencies['@pnpm.e2e/dep-of-pkg-with-1-dep'] = '100.0.0'
|
|
break
|
|
}
|
|
return manifest
|
|
}
|
|
|
|
await addDependenciesToPackage({}, ['@pnpm.e2e/pkg-with-1-dep'], testDefaults({
|
|
hooks: {
|
|
readPackage: [readPackageHook1, readPackageHook2],
|
|
},
|
|
}))
|
|
|
|
project.storeHas('@pnpm.e2e/dep-of-pkg-with-1-dep', '100.0.0')
|
|
})
|