mirror of
https://github.com/pnpm/pnpm.git
synced 2026-05-13 19:16:21 -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.
88 lines
2.1 KiB
TypeScript
88 lines
2.1 KiB
TypeScript
import { expect, test } from '@jest/globals'
|
|
import type { PnpmError } from '@pnpm/error'
|
|
import type { ProjectRootDir } from '@pnpm/types'
|
|
|
|
import {
|
|
createWorkspaceSpecs,
|
|
updateToWorkspacePackagesFromManifest,
|
|
} from '../lib/updateWorkspaceDependencies.js'
|
|
|
|
const INCLUDE_ALL = {
|
|
dependencies: true,
|
|
devDependencies: true,
|
|
optionalDependencies: true,
|
|
}
|
|
|
|
const WORKSPACE_PACKAGES = new Map([
|
|
['bar', new Map([
|
|
['100.0.0', {
|
|
rootDir: '' as ProjectRootDir,
|
|
manifest: {
|
|
name: 'foo',
|
|
version: '100.0.0',
|
|
},
|
|
}],
|
|
])],
|
|
['foo', new Map([
|
|
['100.0.0', {
|
|
rootDir: '' as ProjectRootDir,
|
|
manifest: {
|
|
name: 'foo',
|
|
version: '100.0.0',
|
|
},
|
|
}],
|
|
])],
|
|
['qar', new Map([
|
|
['100.0.0', {
|
|
rootDir: '' as ProjectRootDir,
|
|
manifest: {
|
|
name: 'foo',
|
|
version: '100.0.0',
|
|
},
|
|
}],
|
|
])],
|
|
])
|
|
|
|
test('updateToWorkspacePackagesFromManifest()', () => {
|
|
const manifest = {
|
|
dependencies: {
|
|
alpha: '1.0.0',
|
|
foo: '1.0.0',
|
|
},
|
|
devDependencies: {
|
|
bar: '1.0.0',
|
|
betta: '1.0.0',
|
|
},
|
|
optionalDependencies: {
|
|
hamma: '1.0.0', // cspell:disable-line
|
|
qar: '1.0.0',
|
|
},
|
|
}
|
|
expect(updateToWorkspacePackagesFromManifest(
|
|
manifest,
|
|
INCLUDE_ALL,
|
|
WORKSPACE_PACKAGES
|
|
)).toStrictEqual(['bar@workspace:*', 'foo@workspace:*', 'qar@workspace:*'])
|
|
expect(updateToWorkspacePackagesFromManifest(
|
|
manifest,
|
|
{
|
|
dependencies: true,
|
|
devDependencies: false,
|
|
optionalDependencies: false,
|
|
},
|
|
WORKSPACE_PACKAGES
|
|
)).toStrictEqual(['foo@workspace:*'])
|
|
})
|
|
|
|
test('createWorkspaceSpecs', () => {
|
|
expect(createWorkspaceSpecs(['bar', 'foo@2', 'qar@workspace:3'], WORKSPACE_PACKAGES)).toStrictEqual(['bar@workspace:*', 'foo@workspace:2', 'qar@workspace:3'])
|
|
let err!: PnpmError
|
|
try {
|
|
createWorkspaceSpecs(['express'], WORKSPACE_PACKAGES)
|
|
} catch (_err: any) { // eslint-disable-line
|
|
err = _err
|
|
}
|
|
expect(err.code).toBe('ERR_PNPM_WORKSPACE_PACKAGE_NOT_FOUND')
|
|
expect(err.message).toBe('"express" not found in the workspace')
|
|
})
|