mirror of
https://github.com/pnpm/pnpm.git
synced 2026-07-22 13:42:50 -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.
147 lines
4.8 KiB
TypeScript
147 lines
4.8 KiB
TypeScript
/// <reference path="../../../__typings__/index.d.ts"/>
|
|
import { afterEach, beforeEach, describe, expect, test } from '@jest/globals'
|
|
import { createFetchFromRegistry } from '@pnpm/network.fetch'
|
|
import { createNpmResolver } from '@pnpm/resolving.npm-resolver'
|
|
import type { Registries } from '@pnpm/types'
|
|
import { temporaryDirectory } from 'tempy'
|
|
|
|
import { getMockAgent, setupMockAgent, teardownMockAgent } from './utils/index.js'
|
|
|
|
const registries = {
|
|
default: 'https://registry.npmjs.org/',
|
|
} satisfies Registries
|
|
|
|
const fetch = createFetchFromRegistry({})
|
|
const getAuthHeader = () => undefined
|
|
const createResolveFromNpm = createNpmResolver.bind(null, fetch, getAuthHeader)
|
|
|
|
afterEach(async () => {
|
|
await teardownMockAgent()
|
|
})
|
|
|
|
beforeEach(async () => {
|
|
await setupMockAgent()
|
|
})
|
|
|
|
describe('optional dependencies', () => {
|
|
test('optional dependencies receive full metadata with libc field', async () => {
|
|
// This test verifies the fix for https://github.com/pnpm/pnpm/issues/9950
|
|
// Optional dependencies need full metadata to get the libc field for platform compatibility checks.
|
|
const packageMeta = {
|
|
name: 'platform-pkg',
|
|
'dist-tags': { latest: '1.0.0' },
|
|
versions: {
|
|
'1.0.0': {
|
|
name: 'platform-pkg',
|
|
version: '1.0.0',
|
|
os: ['linux'],
|
|
cpu: ['x64'],
|
|
libc: ['glibc'],
|
|
dist: {
|
|
tarball: 'https://registry.npmjs.org/platform-pkg/-/platform-pkg-1.0.0.tgz',
|
|
integrity: 'sha512-test1234567890123456789012345678901234567890123456789012345678',
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
// Mock the full metadata request for optional dependency
|
|
getMockAgent().get(registries.default.replace(/\/$/, ''))
|
|
.intercept({ path: '/platform-pkg', method: 'GET' })
|
|
.reply(200, packageMeta)
|
|
|
|
const { resolveFromNpm } = createResolveFromNpm({
|
|
storeDir: temporaryDirectory(),
|
|
cacheDir: temporaryDirectory(),
|
|
registries,
|
|
})
|
|
|
|
const result = await resolveFromNpm(
|
|
{
|
|
alias: 'platform-pkg',
|
|
bareSpecifier: '1.0.0',
|
|
optional: true,
|
|
},
|
|
{}
|
|
)
|
|
|
|
expect(result!.manifest!.libc).toEqual(['glibc'])
|
|
expect(result!.manifest!.os).toEqual(['linux'])
|
|
expect(result!.manifest!.cpu).toEqual(['x64'])
|
|
})
|
|
|
|
test('abbreviated and full metadata are cached separately', async () => {
|
|
// Abbreviated metadata doesn't include scripts, full metadata does.
|
|
// When resolving the same package first as regular, then as optional,
|
|
// we should get different metadata from each request.
|
|
const abbreviatedMeta = {
|
|
name: 'cache-test',
|
|
'dist-tags': { latest: '1.0.0' },
|
|
versions: {
|
|
'1.0.0': {
|
|
name: 'cache-test',
|
|
version: '1.0.0',
|
|
dist: {
|
|
tarball: 'https://registry.npmjs.org/cache-test/-/cache-test-1.0.0.tgz',
|
|
integrity: 'sha512-test1234567890123456789012345678901234567890123456789012345678',
|
|
},
|
|
},
|
|
},
|
|
}
|
|
const fullMeta = {
|
|
name: 'cache-test',
|
|
'dist-tags': { latest: '1.0.0' },
|
|
versions: {
|
|
'1.0.0': {
|
|
name: 'cache-test',
|
|
version: '1.0.0',
|
|
scripts: {
|
|
test: 'jest',
|
|
build: 'tsc',
|
|
},
|
|
dist: {
|
|
tarball: 'https://registry.npmjs.org/cache-test/-/cache-test-1.0.0.tgz',
|
|
integrity: 'sha512-test1234567890123456789012345678901234567890123456789012345678',
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
const mockPool = getMockAgent().get(registries.default.replace(/\/$/, ''))
|
|
// First request: abbreviated metadata for regular dependency (accept header prefers abbreviated)
|
|
mockPool.intercept({
|
|
path: '/cache-test',
|
|
method: 'GET',
|
|
headers: { accept: /application\/vnd\.npm\.install-v1\+json/ },
|
|
}).reply(200, abbreviatedMeta)
|
|
// Second request: full metadata for optional dependency (accept header prefers full JSON)
|
|
mockPool.intercept({
|
|
path: '/cache-test',
|
|
method: 'GET',
|
|
headers: { accept: /application\/json/ },
|
|
}).reply(200, fullMeta)
|
|
|
|
const cacheDir = temporaryDirectory()
|
|
|
|
const { resolveFromNpm } = createResolveFromNpm({
|
|
storeDir: temporaryDirectory(),
|
|
cacheDir,
|
|
registries,
|
|
})
|
|
|
|
// Resolve as regular dependency - should get abbreviated metadata
|
|
const regularResult = await resolveFromNpm(
|
|
{ alias: 'cache-test', bareSpecifier: '1.0.0' },
|
|
{}
|
|
)
|
|
expect(regularResult!.manifest!.scripts).toBeUndefined()
|
|
|
|
// Resolve as optional dependency - should get full metadata (separate cache entry)
|
|
const optionalResult = await resolveFromNpm(
|
|
{ alias: 'cache-test', bareSpecifier: '1.0.0', optional: true },
|
|
{}
|
|
)
|
|
expect(optionalResult!.manifest!.scripts).toEqual({ test: 'jest', build: 'tsc' })
|
|
})
|
|
})
|