mirror of
https://github.com/pnpm/pnpm.git
synced 2026-04-27 10:30:58 -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.
63 lines
2.1 KiB
TypeScript
63 lines
2.1 KiB
TypeScript
import { expect, test } from '@jest/globals'
|
|
import { createHexHash } from '@pnpm/crypto.hash'
|
|
|
|
import { createCacheKey } from '../src/dlx.js'
|
|
|
|
test('creates a hash', () => {
|
|
const received = createCacheKey({
|
|
packages: ['shx', '@foo/bar'],
|
|
registries: {
|
|
default: 'https://registry.npmjs.com/',
|
|
'@foo': 'https://example.com/npm-registry/foo/',
|
|
},
|
|
})
|
|
const expected = createHexHash(JSON.stringify([['@foo/bar', 'shx'], [
|
|
['@foo', 'https://example.com/npm-registry/foo/'],
|
|
['default', 'https://registry.npmjs.com/'],
|
|
]]))
|
|
expect(received).toBe(expected)
|
|
})
|
|
|
|
test('is agnostic to package order', () => {
|
|
const registries = { default: 'https://registry.npmjs.com/' }
|
|
const makeOpts = (packages: string[]) => ({ packages, registries })
|
|
expect(createCacheKey(makeOpts(['a', 'c', 'b']))).toBe(createCacheKey(makeOpts(['a', 'b', 'c'])))
|
|
expect(createCacheKey(makeOpts(['b', 'a', 'c']))).toBe(createCacheKey(makeOpts(['a', 'b', 'c'])))
|
|
expect(createCacheKey(makeOpts(['b', 'c', 'a']))).toBe(createCacheKey(makeOpts(['a', 'b', 'c'])))
|
|
expect(createCacheKey(makeOpts(['c', 'a', 'b']))).toBe(createCacheKey(makeOpts(['a', 'b', 'c'])))
|
|
expect(createCacheKey(makeOpts(['c', 'b', 'a']))).toBe(createCacheKey(makeOpts(['a', 'b', 'c'])))
|
|
})
|
|
|
|
test('is agnostic to registry key order', () => {
|
|
const packages = ['a', 'b', 'c']
|
|
const foo = 'https://example.com/foo/'
|
|
const bar = 'https://example.com/bar/'
|
|
expect(createCacheKey({
|
|
packages,
|
|
registries: { '@foo': foo, '@bar': bar },
|
|
})).toBe(createCacheKey({
|
|
packages,
|
|
registries: { '@bar': bar, '@foo': foo },
|
|
}))
|
|
})
|
|
|
|
test('is agnostic to supportedArchitectures values order', () => {
|
|
const packages = ['a', 'b', 'c']
|
|
const registries = { default: 'https://registry.npmjs.com/' }
|
|
expect(createCacheKey({
|
|
packages,
|
|
registries,
|
|
supportedArchitectures: {
|
|
os: ['win32', 'linux', 'darwin'],
|
|
cpu: ['x86_64', 'armv7', 'i686'],
|
|
},
|
|
})).toBe(createCacheKey({
|
|
packages,
|
|
registries,
|
|
supportedArchitectures: {
|
|
cpu: ['armv7', 'i686', 'x86_64'],
|
|
os: ['darwin', 'linux', 'win32'],
|
|
},
|
|
}))
|
|
})
|