mirror of
https://github.com/pnpm/pnpm.git
synced 2026-04-27 10:30:58 -04:00
* 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.
162 lines
4.0 KiB
TypeScript
162 lines
4.0 KiB
TypeScript
import fs from 'node:fs'
|
|
import path from 'node:path'
|
|
|
|
import { afterEach, expect, jest, test } from '@jest/globals'
|
|
import { preparePackages } from '@pnpm/prepare'
|
|
import { writeYamlFile } from 'write-yaml-file'
|
|
|
|
import { DEFAULT_OPTS } from './utils/index.js'
|
|
|
|
const debug = jest.fn()
|
|
jest.unstable_mockModule('@pnpm/logger', () => {
|
|
return {
|
|
logger: () => ({ debug }),
|
|
globalInfo: jest.fn(),
|
|
globalWarn: jest.fn(),
|
|
streamParser: jest.fn(),
|
|
}
|
|
})
|
|
|
|
const { filterProjectsBySelectorObjectsFromDir } = await import('@pnpm/workspace.projects-filter')
|
|
const { exec } = await import('@pnpm/exec.commands')
|
|
|
|
afterEach(() => {
|
|
jest.mocked(debug).mockClear()
|
|
})
|
|
|
|
test('pnpm exec --recursive --no-reporter-hide-prefix prints prefixes', async () => {
|
|
preparePackages([
|
|
{
|
|
location: 'packages/foo',
|
|
package: { name: 'foo' },
|
|
},
|
|
{
|
|
location: 'packages/bar',
|
|
package: { name: 'bar' },
|
|
},
|
|
])
|
|
|
|
await writeYamlFile('pnpm-workspace.yaml', {
|
|
packages: ['packages/*'],
|
|
})
|
|
|
|
const { selectedProjectsGraph } = await filterProjectsBySelectorObjectsFromDir(process.cwd(), [])
|
|
|
|
const scriptFile = path.resolve('script.js')
|
|
fs.writeFileSync(scriptFile, `
|
|
console.log('hello from stdout')
|
|
console.error('hello from stderr')
|
|
console.log('name is ' + require(require('path').resolve('package.json')).name)
|
|
`)
|
|
|
|
await exec.handler({
|
|
...DEFAULT_OPTS,
|
|
dir: process.cwd(),
|
|
recursive: true,
|
|
bail: true,
|
|
reporterHidePrefix: false,
|
|
selectedProjectsGraph,
|
|
}, [process.execPath, scriptFile])
|
|
|
|
for (const name of ['foo', 'bar']) {
|
|
const loggerOpts = {
|
|
wd: path.resolve('packages', name),
|
|
depPath: name,
|
|
stage: '(exec)',
|
|
}
|
|
expect(debug).toHaveBeenCalledWith({
|
|
...loggerOpts,
|
|
line: 'hello from stdout',
|
|
stdio: 'stdout',
|
|
})
|
|
expect(debug).toHaveBeenCalledWith({
|
|
...loggerOpts,
|
|
line: 'hello from stderr',
|
|
stdio: 'stderr',
|
|
})
|
|
expect(debug).toHaveBeenCalledWith({
|
|
...loggerOpts,
|
|
line: `name is ${name}`,
|
|
stdio: 'stdout',
|
|
})
|
|
expect(debug).toHaveBeenCalledWith({
|
|
...loggerOpts,
|
|
optional: false,
|
|
exitCode: 0,
|
|
})
|
|
}
|
|
})
|
|
|
|
test('pnpm exec --recursive --reporter-hide-prefix does not print prefixes', async () => {
|
|
preparePackages([
|
|
{
|
|
location: 'packages/foo',
|
|
package: { name: 'foo' },
|
|
},
|
|
{
|
|
location: 'packages/bar',
|
|
package: { name: 'bar' },
|
|
},
|
|
])
|
|
|
|
await writeYamlFile('pnpm-workspace.yaml', {
|
|
packages: ['packages/*'],
|
|
})
|
|
|
|
const { selectedProjectsGraph } = await filterProjectsBySelectorObjectsFromDir(process.cwd(), [])
|
|
|
|
const scriptFile = path.resolve('script.js')
|
|
fs.writeFileSync(scriptFile, `
|
|
console.log('hello from stdout')
|
|
console.error('hello from stderr')
|
|
console.log('name is ' + require(require('path').resolve('package.json')).name)
|
|
`)
|
|
|
|
await exec.handler({
|
|
...DEFAULT_OPTS,
|
|
dir: process.cwd(),
|
|
recursive: true,
|
|
bail: true,
|
|
reporterHidePrefix: true,
|
|
selectedProjectsGraph,
|
|
}, [process.execPath, scriptFile])
|
|
|
|
expect(debug).not.toHaveBeenCalled()
|
|
})
|
|
|
|
test('pnpm exec --recursive does not print prefixes by default', async () => {
|
|
preparePackages([
|
|
{
|
|
location: 'packages/foo',
|
|
package: { name: 'foo' },
|
|
},
|
|
{
|
|
location: 'packages/bar',
|
|
package: { name: 'bar' },
|
|
},
|
|
])
|
|
|
|
await writeYamlFile('pnpm-workspace.yaml', {
|
|
packages: ['packages/*'],
|
|
})
|
|
|
|
const { selectedProjectsGraph } = await filterProjectsBySelectorObjectsFromDir(process.cwd(), [])
|
|
|
|
const scriptFile = path.resolve('script.js')
|
|
fs.writeFileSync(scriptFile, `
|
|
console.log('hello from stdout')
|
|
console.error('hello from stderr')
|
|
console.log('name is ' + require(require('path').resolve('package.json')).name)
|
|
`)
|
|
|
|
await exec.handler({
|
|
...DEFAULT_OPTS,
|
|
dir: process.cwd(),
|
|
recursive: true,
|
|
bail: true,
|
|
selectedProjectsGraph,
|
|
}, [process.execPath, scriptFile])
|
|
|
|
expect(debug).not.toHaveBeenCalled()
|
|
})
|