mirror of
https://github.com/pnpm/pnpm.git
synced 2026-07-22 13:42:50 -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.
126 lines
3.8 KiB
TypeScript
126 lines
3.8 KiB
TypeScript
import fs from 'node:fs'
|
|
import path from 'node:path'
|
|
|
|
import { expect, test } from '@jest/globals'
|
|
import { config } from '@pnpm/config.commands'
|
|
import { tempDir } from '@pnpm/prepare'
|
|
import { readIniFileSync } from 'read-ini-file'
|
|
import { readYamlFileSync } from 'read-yaml-file'
|
|
import { writeYamlFileSync } from 'write-yaml-file'
|
|
|
|
import { createConfigCommandOpts } from './utils/index.js'
|
|
|
|
test('config delete on registry key not set', async () => {
|
|
const tmp = tempDir()
|
|
const configDir = path.join(tmp, 'global-config')
|
|
fs.mkdirSync(configDir, { recursive: true })
|
|
fs.writeFileSync(path.join(configDir, 'auth.ini'), '@my-company:registry=https://registry.my-company.example.com/')
|
|
|
|
await config.handler(createConfigCommandOpts({
|
|
dir: process.cwd(),
|
|
cliOptions: {},
|
|
configDir,
|
|
global: true,
|
|
authConfig: {},
|
|
}), ['delete', 'registry'])
|
|
|
|
expect(readIniFileSync(path.join(configDir, 'auth.ini'))).toEqual({
|
|
'@my-company:registry': 'https://registry.my-company.example.com/',
|
|
})
|
|
})
|
|
|
|
test('config delete on registry key set', async () => {
|
|
const tmp = tempDir()
|
|
const configDir = path.join(tmp, 'global-config')
|
|
fs.mkdirSync(configDir, { recursive: true })
|
|
fs.writeFileSync(path.join(configDir, 'auth.ini'), 'registry=https://registry.my-company.example.com/')
|
|
|
|
await config.handler(createConfigCommandOpts({
|
|
dir: process.cwd(),
|
|
cliOptions: {},
|
|
configDir,
|
|
global: true,
|
|
authConfig: {},
|
|
}), ['delete', 'registry'])
|
|
|
|
expect(readIniFileSync(path.join(configDir, 'auth.ini'))).toEqual({})
|
|
})
|
|
|
|
test('config delete on npm-compatible key not set', async () => {
|
|
const tmp = tempDir()
|
|
const configDir = path.join(tmp, 'global-config')
|
|
fs.mkdirSync(configDir, { recursive: true })
|
|
fs.writeFileSync(path.join(configDir, 'auth.ini'), '@my-company:registry=https://registry.my-company.example.com/')
|
|
|
|
await config.handler(createConfigCommandOpts({
|
|
dir: process.cwd(),
|
|
cliOptions: {},
|
|
configDir,
|
|
global: true,
|
|
authConfig: {},
|
|
}), ['delete', 'cafile'])
|
|
|
|
expect(readIniFileSync(path.join(configDir, 'auth.ini'))).toEqual({
|
|
'@my-company:registry': 'https://registry.my-company.example.com/',
|
|
})
|
|
})
|
|
|
|
test('config delete on npm-compatible key set', async () => {
|
|
const tmp = tempDir()
|
|
const configDir = path.join(tmp, 'global-config')
|
|
fs.mkdirSync(configDir, { recursive: true })
|
|
fs.writeFileSync(path.join(configDir, 'auth.ini'), 'cafile=some-cafile')
|
|
|
|
await config.handler(createConfigCommandOpts({
|
|
dir: process.cwd(),
|
|
cliOptions: {},
|
|
configDir,
|
|
global: true,
|
|
authConfig: {},
|
|
}), ['delete', 'cafile'])
|
|
|
|
// NOTE: pnpm currently does not delete empty rc files.
|
|
// TODO: maybe we should?
|
|
expect(readIniFileSync(path.join(configDir, 'auth.ini'))).toEqual({})
|
|
})
|
|
|
|
test('config delete on pnpm-specific key not set', async () => {
|
|
const tmp = tempDir()
|
|
const configDir = path.join(tmp, 'global-config')
|
|
fs.mkdirSync(configDir, { recursive: true })
|
|
writeYamlFileSync(path.join(configDir, 'config.yaml'), {
|
|
cacheDir: '~/cache',
|
|
})
|
|
|
|
await config.handler(createConfigCommandOpts({
|
|
dir: process.cwd(),
|
|
cliOptions: {},
|
|
configDir,
|
|
global: true,
|
|
authConfig: {},
|
|
}), ['delete', 'store-dir'])
|
|
|
|
expect(readYamlFileSync(path.join(configDir, 'config.yaml'))).toStrictEqual({
|
|
cacheDir: '~/cache',
|
|
})
|
|
})
|
|
|
|
test('config delete on pnpm-specific key set', async () => {
|
|
const tmp = tempDir()
|
|
const configDir = path.join(tmp, 'global-config')
|
|
fs.mkdirSync(configDir, { recursive: true })
|
|
writeYamlFileSync(path.join(configDir, 'config.yaml'), {
|
|
cacheDir: '~/cache',
|
|
})
|
|
|
|
await config.handler(createConfigCommandOpts({
|
|
dir: process.cwd(),
|
|
cliOptions: {},
|
|
configDir,
|
|
global: true,
|
|
authConfig: {},
|
|
}), ['delete', 'cache-dir'])
|
|
|
|
expect(fs.readdirSync(configDir)).not.toContain('config.yaml')
|
|
})
|