mirror of
https://github.com/pnpm/pnpm.git
synced 2026-05-12 10:11:42 -04:00
4d7cd56ccc
* 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.
182 lines
4.3 KiB
TypeScript
182 lines
4.3 KiB
TypeScript
import path from 'node:path'
|
|
|
|
import { expect, test } from '@jest/globals'
|
|
import { add } from '@pnpm/installing.commands'
|
|
import type { LockfileObject } from '@pnpm/lockfile.types'
|
|
import { preparePackages } from '@pnpm/prepare'
|
|
import type { ProjectId } from '@pnpm/types'
|
|
import { filterProjectsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter'
|
|
import { readYamlFileSync } from 'read-yaml-file'
|
|
|
|
import { DEFAULT_OPTS } from './utils/index.js'
|
|
|
|
test('recursive add --save-dev, --save-peer on workspace with multiple lockfiles', async () => {
|
|
const projects = preparePackages([
|
|
{
|
|
name: 'project-1',
|
|
version: '1.0.0',
|
|
},
|
|
{
|
|
name: 'project-2',
|
|
version: '1.0.0',
|
|
},
|
|
])
|
|
|
|
const { allProjects, selectedProjectsGraph } = await filterProjectsBySelectorObjectsFromDir(process.cwd(), [])
|
|
|
|
await add.handler({
|
|
...DEFAULT_OPTS,
|
|
allProjects,
|
|
dir: process.cwd(),
|
|
recursive: true,
|
|
saveDev: true,
|
|
selectedProjectsGraph,
|
|
workspaceDir: process.cwd(),
|
|
}, ['is-positive@1.0.0'])
|
|
await add.handler({
|
|
...DEFAULT_OPTS,
|
|
allProjects,
|
|
dir: process.cwd(),
|
|
recursive: true,
|
|
savePeer: true,
|
|
selectedProjectsGraph,
|
|
workspaceDir: process.cwd(),
|
|
}, ['is-negative@1.0.0'])
|
|
|
|
{
|
|
const { default: manifest } = (await import(path.resolve('project-1/package.json')))
|
|
expect(
|
|
manifest.devDependencies
|
|
).toEqual(
|
|
{ 'is-positive': '1.0.0', 'is-negative': '1.0.0' }
|
|
)
|
|
expect(
|
|
manifest.peerDependencies
|
|
).toEqual(
|
|
{ 'is-negative': '1.0.0' }
|
|
)
|
|
expect(
|
|
projects['project-1'].readLockfile().importers['.'].devDependencies
|
|
).toEqual(
|
|
{
|
|
'is-positive': {
|
|
specifier: '1.0.0',
|
|
version: '1.0.0',
|
|
},
|
|
'is-negative': {
|
|
specifier: '1.0.0',
|
|
version: '1.0.0',
|
|
},
|
|
}
|
|
)
|
|
}
|
|
|
|
{
|
|
const { default: manifest } = (await import(path.resolve('project-2/package.json')))
|
|
expect(
|
|
manifest.devDependencies
|
|
).toEqual(
|
|
{ 'is-positive': '1.0.0', 'is-negative': '1.0.0' }
|
|
)
|
|
expect(
|
|
manifest.peerDependencies
|
|
).toEqual(
|
|
{ 'is-negative': '1.0.0' }
|
|
)
|
|
expect(
|
|
projects['project-2'].readLockfile().importers['.'].devDependencies
|
|
).toEqual(
|
|
{
|
|
'is-positive': {
|
|
specifier: '1.0.0',
|
|
version: '1.0.0',
|
|
},
|
|
'is-negative': {
|
|
specifier: '1.0.0',
|
|
version: '1.0.0',
|
|
},
|
|
}
|
|
)
|
|
}
|
|
})
|
|
|
|
test('recursive add --save-dev, --save-peer on workspace with single lockfile', async () => {
|
|
preparePackages([
|
|
{
|
|
name: 'project-1',
|
|
version: '1.0.0',
|
|
},
|
|
{
|
|
name: 'project-2',
|
|
version: '1.0.0',
|
|
},
|
|
])
|
|
|
|
const { allProjects, selectedProjectsGraph } = await filterProjectsBySelectorObjectsFromDir(process.cwd(), [])
|
|
|
|
await add.handler({
|
|
...DEFAULT_OPTS,
|
|
allProjects,
|
|
dir: process.cwd(),
|
|
lockfileDir: process.cwd(),
|
|
recursive: true,
|
|
saveDev: true,
|
|
selectedProjectsGraph,
|
|
workspaceDir: process.cwd(),
|
|
}, ['is-positive@1.0.0'])
|
|
await add.handler({
|
|
...DEFAULT_OPTS,
|
|
allProjects,
|
|
dir: process.cwd(),
|
|
lockfileDir: process.cwd(),
|
|
recursive: true,
|
|
savePeer: true,
|
|
selectedProjectsGraph,
|
|
workspaceDir: process.cwd(),
|
|
}, ['is-negative@1.0.0'])
|
|
|
|
{
|
|
const { default: manifest } = (await import(path.resolve('project-1/package.json')))
|
|
expect(
|
|
manifest.devDependencies
|
|
).toEqual(
|
|
{ 'is-positive': '1.0.0', 'is-negative': '1.0.0' }
|
|
)
|
|
expect(
|
|
manifest.peerDependencies
|
|
).toEqual(
|
|
{ 'is-negative': '1.0.0' }
|
|
)
|
|
}
|
|
|
|
{
|
|
const { default: manifest } = (await import(path.resolve('project-2/package.json')))
|
|
expect(
|
|
manifest.devDependencies
|
|
).toEqual(
|
|
{ 'is-positive': '1.0.0', 'is-negative': '1.0.0' }
|
|
)
|
|
expect(
|
|
manifest.peerDependencies
|
|
).toEqual(
|
|
{ 'is-negative': '1.0.0' }
|
|
)
|
|
}
|
|
|
|
const lockfile = readYamlFileSync<LockfileObject>('./pnpm-lock.yaml')
|
|
expect(
|
|
lockfile.importers['project-1' as ProjectId].devDependencies
|
|
).toEqual(
|
|
{
|
|
'is-positive': {
|
|
specifier: '1.0.0',
|
|
version: '1.0.0',
|
|
},
|
|
'is-negative': {
|
|
specifier: '1.0.0',
|
|
version: '1.0.0',
|
|
},
|
|
}
|
|
)
|
|
})
|