mirror of
https://github.com/pnpm/pnpm.git
synced 2026-05-12 10:11:42 -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.
125 lines
4.0 KiB
TypeScript
125 lines
4.0 KiB
TypeScript
import fs from 'node:fs'
|
|
import path from 'node:path'
|
|
|
|
import { afterEach, beforeEach, expect, test } from '@jest/globals'
|
|
import { ABBREVIATED_META_DIR } from '@pnpm/constants'
|
|
import { createFetchFromRegistry } from '@pnpm/network.fetch'
|
|
import { createNpmResolver } from '@pnpm/resolving.npm-resolver'
|
|
import { fixtures } from '@pnpm/test-fixtures'
|
|
import type { Registries } from '@pnpm/types'
|
|
import { loadJsonFileSync } from 'load-json-file'
|
|
import { temporaryDirectory } from 'tempy'
|
|
|
|
import { getMockAgent, retryLoadJsonFile, setupMockAgent, teardownMockAgent } from './utils/index.js'
|
|
|
|
const f = fixtures(import.meta.dirname)
|
|
|
|
const registries: Registries = {
|
|
default: 'https://registry.npmjs.org/',
|
|
}
|
|
|
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
const isPositiveMeta = loadJsonFileSync<any>(f.find('is-positive.json'))
|
|
/* eslint-enable @typescript-eslint/no-explicit-any */
|
|
|
|
const fetch = createFetchFromRegistry({})
|
|
const getAuthHeader = () => undefined
|
|
const createResolveFromNpm = createNpmResolver.bind(null, fetch, getAuthHeader)
|
|
|
|
afterEach(async () => {
|
|
await teardownMockAgent()
|
|
})
|
|
|
|
beforeEach(async () => {
|
|
await setupMockAgent()
|
|
})
|
|
|
|
test('use local cache when registry returns 304 Not Modified', async () => {
|
|
const cacheDir = temporaryDirectory()
|
|
// Write cached metadata with etag to disk in NDJSON format:
|
|
// Line 1: cache headers, Line 2: registry metadata
|
|
const cacheDir2 = path.join(cacheDir, `${ABBREVIATED_META_DIR}/registry.npmjs.org`)
|
|
fs.mkdirSync(cacheDir2, { recursive: true })
|
|
const headers = JSON.stringify({ etag: '"abc123"', modified: isPositiveMeta.modified })
|
|
fs.writeFileSync(
|
|
path.join(cacheDir2, 'is-positive.jsonl'),
|
|
`${headers}\n${JSON.stringify(isPositiveMeta)}`,
|
|
'utf8'
|
|
)
|
|
|
|
// Registry returns 304 Not Modified — verify conditional headers are sent
|
|
getMockAgent().get(registries.default.replace(/\/$/, ''))
|
|
.intercept({
|
|
path: '/is-positive',
|
|
method: 'GET',
|
|
headers: {
|
|
'if-none-match': '"abc123"',
|
|
},
|
|
})
|
|
.reply(304, '')
|
|
|
|
const { resolveFromNpm } = createResolveFromNpm({
|
|
storeDir: temporaryDirectory(),
|
|
cacheDir,
|
|
registries,
|
|
})
|
|
const resolveResult = await resolveFromNpm(
|
|
{ alias: 'is-positive', bareSpecifier: '^3.0.0' },
|
|
{}
|
|
)
|
|
|
|
expect(resolveResult!.resolvedVia).toBe('npm-registry')
|
|
expect(resolveResult!.id).toBe('is-positive@3.1.0')
|
|
})
|
|
|
|
test('store etag from 200 response in cache', async () => {
|
|
const cacheDir = temporaryDirectory()
|
|
const responseHeaders = {
|
|
etag: '"xyz789"',
|
|
}
|
|
|
|
getMockAgent().get(registries.default.replace(/\/$/, ''))
|
|
.intercept({ path: '/is-positive', method: 'GET' })
|
|
.reply(200, isPositiveMeta, { headers: responseHeaders })
|
|
|
|
const { resolveFromNpm } = createResolveFromNpm({
|
|
storeDir: temporaryDirectory(),
|
|
cacheDir,
|
|
registries,
|
|
})
|
|
const resolveResult = await resolveFromNpm(
|
|
{ alias: 'is-positive', bareSpecifier: '^3.0.0' },
|
|
{}
|
|
)
|
|
|
|
expect(resolveResult!.resolvedVia).toBe('npm-registry')
|
|
expect(resolveResult!.id).toBe('is-positive@3.1.0')
|
|
|
|
// Verify etag was saved to disk cache
|
|
const cachePath = path.join(cacheDir, `${ABBREVIATED_META_DIR}/registry.npmjs.org/is-positive.jsonl`)
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
const savedMeta = await retryLoadJsonFile<any>(cachePath)
|
|
expect(savedMeta.etag).toBe('"xyz789"')
|
|
})
|
|
|
|
test('fetch without conditional headers when no local cache exists', async () => {
|
|
// No cache file → no ETag/Last-Modified to send → normal 200 response
|
|
getMockAgent().get(registries.default.replace(/\/$/, ''))
|
|
.intercept({ path: '/is-positive', method: 'GET' })
|
|
.reply(200, isPositiveMeta)
|
|
|
|
const cacheDir = temporaryDirectory()
|
|
const { resolveFromNpm } = createResolveFromNpm({
|
|
storeDir: temporaryDirectory(),
|
|
cacheDir,
|
|
registries,
|
|
})
|
|
const resolveResult = await resolveFromNpm(
|
|
{ alias: 'is-positive', bareSpecifier: '^3.0.0' },
|
|
{}
|
|
)
|
|
|
|
expect(resolveResult!.resolvedVia).toBe('npm-registry')
|
|
expect(resolveResult!.id).toBe('is-positive@3.1.0')
|
|
})
|