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.
174 lines
4.1 KiB
TypeScript
174 lines
4.1 KiB
TypeScript
import fs from 'node:fs'
|
|
|
|
import { expect, test } from '@jest/globals'
|
|
import { prepareEmpty } from '@pnpm/prepare'
|
|
|
|
import { getNetworkConfigs, type NetworkConfigs } from '../src/getNetworkConfigs.js'
|
|
|
|
test('without files', () => {
|
|
expect(getNetworkConfigs({})).toStrictEqual({
|
|
registries: {},
|
|
} as NetworkConfigs)
|
|
|
|
expect(getNetworkConfigs({
|
|
'@foo:registry': 'https://example.com/foo',
|
|
})).toStrictEqual({
|
|
registries: {
|
|
'@foo': 'https://example.com/foo',
|
|
},
|
|
} as NetworkConfigs)
|
|
|
|
expect(getNetworkConfigs({
|
|
'//example.com/foo:ca': 'some-ca',
|
|
})).toStrictEqual({
|
|
registries: {},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
tls: { ca: 'some-ca' },
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
|
|
expect(getNetworkConfigs({
|
|
'//example.com/foo:cert': 'some-cert',
|
|
})).toStrictEqual({
|
|
registries: {},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
tls: { cert: 'some-cert' },
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
|
|
expect(getNetworkConfigs({
|
|
'@foo:registry': 'https://example.com/foo',
|
|
'//example.com/foo:ca': 'some-ca',
|
|
'//example.com/foo:cert': 'some-cert',
|
|
})).toStrictEqual({
|
|
registries: {
|
|
'@foo': 'https://example.com/foo',
|
|
},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
tls: { ca: 'some-ca', cert: 'some-cert' },
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
})
|
|
|
|
test('with files', () => {
|
|
prepareEmpty()
|
|
|
|
fs.writeFileSync('cafile', 'some-ca')
|
|
fs.writeFileSync('certfile', 'some-cert')
|
|
|
|
expect(getNetworkConfigs({
|
|
'@foo:registry': 'https://example.com/foo',
|
|
'//example.com/foo:cafile': 'cafile',
|
|
'//example.com/foo:certfile': 'certfile',
|
|
})).toStrictEqual({
|
|
registries: {
|
|
'@foo': 'https://example.com/foo',
|
|
},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
tls: { ca: 'some-ca', cert: 'some-cert' },
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
})
|
|
|
|
test('auth and tls combined', () => {
|
|
expect(getNetworkConfigs({
|
|
'@foo:registry': 'https://example.com/foo',
|
|
'//example.com/foo:_authToken': 'example auth token',
|
|
})).toStrictEqual({
|
|
registries: {
|
|
'@foo': 'https://example.com/foo',
|
|
},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
creds: { authToken: 'example auth token' },
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
|
|
expect(getNetworkConfigs({
|
|
'@foo:registry': 'https://example.com/foo',
|
|
'//example.com/foo:_auth': btoa('foo:bar'),
|
|
})).toStrictEqual({
|
|
registries: {
|
|
'@foo': 'https://example.com/foo',
|
|
},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
creds: {
|
|
basicAuth: {
|
|
username: 'foo',
|
|
password: 'bar',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
|
|
expect(getNetworkConfigs({
|
|
'@foo:registry': 'https://example.com/foo',
|
|
'//example.com/foo:username': 'foo',
|
|
'//example.com/foo:_password': btoa('bar'),
|
|
})).toStrictEqual({
|
|
registries: {
|
|
'@foo': 'https://example.com/foo',
|
|
},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
creds: {
|
|
basicAuth: {
|
|
username: 'foo',
|
|
password: 'bar',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
|
|
expect(getNetworkConfigs({
|
|
'@foo:registry': 'https://example.com/foo',
|
|
'//example.com/foo:tokenHelper': 'node ./my-token-helper.cjs',
|
|
})).toStrictEqual({
|
|
registries: {
|
|
'@foo': 'https://example.com/foo',
|
|
},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
creds: { tokenHelper: ['node', './my-token-helper.cjs'] },
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
|
|
expect(getNetworkConfigs({
|
|
'//example.com/foo:_authToken': 'token',
|
|
'//example.com/foo:cert': 'some-cert',
|
|
'//example.com/foo:key': 'some-key',
|
|
})).toStrictEqual({
|
|
registries: {},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
creds: { authToken: 'token' },
|
|
tls: { cert: 'some-cert', key: 'some-key' },
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
})
|
|
|
|
test('unsupported key', () => {
|
|
expect(getNetworkConfigs({
|
|
'@foo:registry': 'https://example.com/foo',
|
|
'//example.com/foo:someUnsupportedKey': 'hello world',
|
|
})).toStrictEqual({
|
|
registries: {
|
|
'@foo': 'https://example.com/foo',
|
|
},
|
|
} as NetworkConfigs)
|
|
})
|