mirror of
https://github.com/pnpm/pnpm.git
synced 2026-06-30 02:45:11 -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.
96 lines
2.9 KiB
TypeScript
96 lines
2.9 KiB
TypeScript
import { expect, test } from '@jest/globals'
|
|
|
|
import type { InheritableConfigPair } from './inheritPickedConfig.js'
|
|
import { inheritAuthConfig, inheritDlxConfig } from './localConfig.js'
|
|
|
|
test('inheritAuthConfig copies only auth keys from source to target', () => {
|
|
const target: InheritableConfigPair = {
|
|
config: {
|
|
bin: 'foo',
|
|
cacheDir: '/path/to/cache/dir',
|
|
registry: 'https://npmjs.com/registry/',
|
|
authConfig: {
|
|
registry: 'https://npmjs.com/registry/',
|
|
},
|
|
},
|
|
}
|
|
|
|
inheritAuthConfig(target, {
|
|
config: {
|
|
bin: 'bar',
|
|
cacheDir: '/path/to/another/cache/dir',
|
|
storeDir: '/path/to/custom/store/dir',
|
|
registry: 'https://example.com/local-registry/',
|
|
authConfig: {
|
|
registry: 'https://example.com/global-registry/',
|
|
'//example.com/global-registry/:_auth': 'MY_SECRET_GLOBAL_AUTH',
|
|
},
|
|
},
|
|
})
|
|
|
|
expect(target.config).toMatchObject({
|
|
bin: 'foo',
|
|
cacheDir: '/path/to/cache/dir',
|
|
registry: 'https://example.com/local-registry/',
|
|
authConfig: {
|
|
registry: 'https://example.com/global-registry/',
|
|
'//example.com/global-registry/:_auth': 'MY_SECRET_GLOBAL_AUTH',
|
|
},
|
|
})
|
|
})
|
|
|
|
test('inheritDlxConfig copies auth and security policy keys from source to target', () => {
|
|
const target: InheritableConfigPair = {
|
|
config: {
|
|
bin: 'foo',
|
|
cacheDir: '/path/to/cache/dir',
|
|
registry: 'https://npmjs.com/registry/',
|
|
shamefullyHoist: true,
|
|
authConfig: {
|
|
registry: 'https://npmjs.com/registry/',
|
|
},
|
|
},
|
|
}
|
|
|
|
inheritDlxConfig(target, {
|
|
config: {
|
|
bin: 'bar',
|
|
cacheDir: '/path/to/another/cache/dir',
|
|
storeDir: '/path/to/custom/store/dir',
|
|
registry: 'https://example.com/local-registry/',
|
|
shamefullyHoist: false,
|
|
minimumReleaseAge: 1440,
|
|
minimumReleaseAgeExclude: ['trusted-pkg'],
|
|
minimumReleaseAgeStrict: true,
|
|
trustPolicy: 'no-downgrade',
|
|
trustPolicyExclude: ['legacy-pkg'],
|
|
trustPolicyIgnoreAfter: 525600,
|
|
authConfig: {
|
|
registry: 'https://example.com/local-registry/',
|
|
'//example.com/local-registry/:_authToken': 'SECRET_TOKEN',
|
|
},
|
|
},
|
|
})
|
|
|
|
// Auth keys and security/trust policy keys are inherited;
|
|
// project-structural keys (bin, cacheDir, shamefullyHoist) keep their target values.
|
|
expect(target.config).toMatchObject({
|
|
bin: 'foo',
|
|
cacheDir: '/path/to/cache/dir',
|
|
shamefullyHoist: true,
|
|
registry: 'https://example.com/local-registry/',
|
|
minimumReleaseAge: 1440,
|
|
minimumReleaseAgeExclude: ['trusted-pkg'],
|
|
minimumReleaseAgeStrict: true,
|
|
trustPolicy: 'no-downgrade',
|
|
trustPolicyExclude: ['legacy-pkg'],
|
|
trustPolicyIgnoreAfter: 525600,
|
|
authConfig: {
|
|
registry: 'https://example.com/local-registry/',
|
|
'//example.com/local-registry/:_authToken': 'SECRET_TOKEN',
|
|
},
|
|
})
|
|
// storeDir exists only on the source, must not be inherited.
|
|
expect(target.config.storeDir).toBeUndefined()
|
|
})
|