mirror of
https://github.com/pnpm/pnpm.git
synced 2026-05-13 11:05:52 -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.
55 lines
2.0 KiB
TypeScript
55 lines
2.0 KiB
TypeScript
import path from 'node:path'
|
|
|
|
import { afterEach, beforeEach, expect, jest, test } from '@jest/globals'
|
|
import { logger } from '@pnpm/logger'
|
|
import {
|
|
findWorkspaceProjects,
|
|
findWorkspaceProjectsNoCheck,
|
|
} from '@pnpm/workspace.projects-reader'
|
|
import { readWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader'
|
|
|
|
beforeEach(() => {
|
|
jest.spyOn(logger, 'warn')
|
|
})
|
|
|
|
afterEach(() => {
|
|
jest.mocked(logger.warn).mockRestore()
|
|
})
|
|
|
|
test('findWorkspaceProjectsNoCheck() skips engine checks', async () => {
|
|
const fixturePath = path.join(import.meta.dirname, '__fixtures__/bad-engine')
|
|
|
|
const workspaceManifest = await readWorkspaceManifest(fixturePath)
|
|
if (workspaceManifest?.packages == null) {
|
|
throw new Error(`Unexpected test setup failure. No pnpm-workspace.yaml packages were defined at ${fixturePath}`)
|
|
}
|
|
|
|
const pkgs = await findWorkspaceProjectsNoCheck(fixturePath, {
|
|
patterns: workspaceManifest.packages,
|
|
})
|
|
expect(pkgs).toHaveLength(1)
|
|
expect(pkgs[0].manifest.name).toBe('pkg')
|
|
})
|
|
|
|
test('findWorkspaceProjects() outputs warnings for non-root workspace project', async () => {
|
|
const fixturePath = path.join(import.meta.dirname, '__fixtures__/warning-for-non-root-project')
|
|
|
|
const workspaceManifest = await readWorkspaceManifest(fixturePath)
|
|
if (workspaceManifest?.packages == null) {
|
|
throw new Error(`Unexpected test setup failure. No pnpm-workspace.yaml packages were defined at ${fixturePath}`)
|
|
}
|
|
|
|
const pkgs = await findWorkspaceProjects(fixturePath, {
|
|
patterns: workspaceManifest.packages,
|
|
sharedWorkspaceLockfile: true,
|
|
})
|
|
expect(pkgs).toHaveLength(3)
|
|
const barPath = path.join(fixturePath, 'packages/bar')
|
|
expect(
|
|
jest.mocked(logger.warn).mock.calls
|
|
.sort((a, b) => JSON.stringify(a).localeCompare(JSON.stringify(b)))
|
|
).toStrictEqual([
|
|
[{ prefix: barPath, message: `The field "resolutions" was found in ${barPath}/package.json. This will not take effect. You should configure "resolutions" at the root of the workspace instead.` }],
|
|
])
|
|
})
|