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.
82 lines
2.7 KiB
TypeScript
82 lines
2.7 KiB
TypeScript
import { describe, expect, it } from '@jest/globals'
|
|
|
|
import { removePort } from '../src/helpers/removePort.js'
|
|
|
|
describe('removePort()', () => {
|
|
it('does not mutate the url if no port is found', () => {
|
|
const urlString = 'https://custom.domain.com/npm/-/foo-1.0.0.tgz'
|
|
expect(removePort(new URL(urlString))).toEqual(urlString)
|
|
|
|
const urlStringWithTrailingSlash = 'https://custom.domain.com/npm/'
|
|
expect(removePort(new URL(urlStringWithTrailingSlash))).toEqual(
|
|
urlStringWithTrailingSlash
|
|
)
|
|
})
|
|
|
|
it('removes ports from urls with https | https | ws | wss protocols', () => {
|
|
const portsToTest = [1, 8888, 8080, 8081, 65535]
|
|
const protocols = ['http', 'https', 'ws', 'wss']
|
|
|
|
const getUrl = (port: number, protocol: string) =>
|
|
new URL(`${protocol}://custom.domain.com:${port}/artifactory/api/npm/npm-virtual/-/foo-1.0.0.tgz`)
|
|
|
|
const expectedOutput = (protocol: string) =>
|
|
`${protocol}://custom.domain.com/artifactory/api/npm/npm-virtual/-/foo-1.0.0.tgz`
|
|
|
|
for (const port of portsToTest) {
|
|
for (const protocol of protocols) {
|
|
expect(removePort(getUrl(port, protocol))).toEqual(
|
|
expectedOutput(protocol)
|
|
)
|
|
}
|
|
}
|
|
})
|
|
|
|
it('removes ports from valid urls with http, https, ws, wss protocols', () => {
|
|
const portsWithEmptyReturns = new Map([
|
|
['http', 80],
|
|
['https', 443],
|
|
['ws', 80],
|
|
['wss', 443],
|
|
])
|
|
|
|
const getUrl = (port: number, protocol: string) =>
|
|
new URL(`${protocol}://custom.domain.com:${port}/artifactory/api/npm/npm-virtual/-/foo-1.0.0.tgz`)
|
|
|
|
const expectedOutput = (protocol: string) =>
|
|
`${protocol}://custom.domain.com/artifactory/api/npm/npm-virtual/-/foo-1.0.0.tgz`
|
|
|
|
portsWithEmptyReturns.forEach((value: number, protocol) => {
|
|
expect(removePort(getUrl(value, protocol))).toEqual(
|
|
expectedOutput(protocol)
|
|
)
|
|
})
|
|
})
|
|
|
|
/**
|
|
* @description intentionally mismatch the port
|
|
* https|wss set to 443
|
|
* http|ws set to 80
|
|
*
|
|
* @tests regexp loopholes of (80:443)
|
|
*/
|
|
it('removes the ports from urls with protocol port mismatches', () => {
|
|
const mismatchProtocolPorts = new Map([
|
|
['http', 443],
|
|
['ws', 443],
|
|
['https', 80],
|
|
['wss', 80],
|
|
])
|
|
|
|
const getUrl = (port: number, protocol: string) =>
|
|
new URL(`${protocol}://custom.domain.com:${port}/artifactory/api/npm/npm-virtual/-/foo-1.0.0.tgz`)
|
|
const expectedOutput = (protocol: string) =>
|
|
`${protocol}://custom.domain.com/artifactory/api/npm/npm-virtual/-/foo-1.0.0.tgz`
|
|
mismatchProtocolPorts.forEach((value: number, protocol) => {
|
|
expect(removePort(getUrl(value, protocol))).toEqual(
|
|
expectedOutput(protocol)
|
|
)
|
|
})
|
|
})
|
|
})
|