mirror of
https://github.com/pnpm/pnpm.git
synced 2026-07-21 21:22:26 -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.
89 lines
2.6 KiB
TypeScript
89 lines
2.6 KiB
TypeScript
import path from 'node:path'
|
|
|
|
import { afterEach, expect, jest, test } from '@jest/globals'
|
|
import { logger } from '@pnpm/logger'
|
|
import { preparePackages } from '@pnpm/prepare'
|
|
import type { ProjectRootDir } from '@pnpm/types'
|
|
|
|
import { loadWorkspaceState, updateWorkspaceState } from '../src/index.js'
|
|
|
|
const originalLoggerDebug = logger.debug
|
|
afterEach(() => {
|
|
logger.debug = originalLoggerDebug
|
|
})
|
|
|
|
test('updateWorkspaceState()', async () => {
|
|
preparePackages(['a', 'b', 'c', 'd'].map(name => ({
|
|
location: `./packages/${name}`,
|
|
package: { name },
|
|
})))
|
|
|
|
const workspaceDir = process.cwd()
|
|
|
|
expect(loadWorkspaceState(workspaceDir)).toBeUndefined()
|
|
|
|
logger.debug = jest.fn(originalLoggerDebug)
|
|
await updateWorkspaceState({
|
|
pnpmfiles: [],
|
|
workspaceDir,
|
|
allProjects: [],
|
|
filteredInstall: false,
|
|
settings: {
|
|
autoInstallPeers: true,
|
|
dedupeDirectDeps: true,
|
|
excludeLinksFromLockfile: false,
|
|
preferWorkspacePackages: false,
|
|
linkWorkspacePackages: false,
|
|
injectWorkspacePackages: false,
|
|
},
|
|
})
|
|
expect(jest.mocked(logger.debug).mock.calls).toStrictEqual([[{ msg: 'updating workspace state' }]])
|
|
expect(loadWorkspaceState(workspaceDir)).toStrictEqual(expect.objectContaining({
|
|
lastValidatedTimestamp: expect.any(Number),
|
|
projects: {},
|
|
}))
|
|
|
|
logger.debug = jest.fn(originalLoggerDebug)
|
|
await updateWorkspaceState({
|
|
pnpmfiles: [],
|
|
workspaceDir,
|
|
settings: {
|
|
autoInstallPeers: true,
|
|
dedupeDirectDeps: true,
|
|
excludeLinksFromLockfile: false,
|
|
preferWorkspacePackages: false,
|
|
injectWorkspacePackages: false,
|
|
catalogs: {
|
|
default: {
|
|
foo: '0.1.2',
|
|
},
|
|
},
|
|
linkWorkspacePackages: true,
|
|
},
|
|
allProjects: [
|
|
{ rootDir: path.resolve('packages/c') as ProjectRootDir, manifest: {} },
|
|
{ rootDir: path.resolve('packages/a') as ProjectRootDir, manifest: {} },
|
|
{ rootDir: path.resolve('packages/d') as ProjectRootDir, manifest: {} },
|
|
{ rootDir: path.resolve('packages/b') as ProjectRootDir, manifest: {} },
|
|
],
|
|
filteredInstall: false,
|
|
})
|
|
expect(jest.mocked(logger.debug).mock.calls).toStrictEqual([[{ msg: 'updating workspace state' }]])
|
|
expect(loadWorkspaceState(workspaceDir)).toStrictEqual(expect.objectContaining({
|
|
settings: expect.objectContaining({
|
|
catalogs: {
|
|
default: {
|
|
foo: '0.1.2',
|
|
},
|
|
},
|
|
}),
|
|
lastValidatedTimestamp: expect.any(Number),
|
|
projects: {
|
|
[path.resolve('packages/a')]: {},
|
|
[path.resolve('packages/b')]: {},
|
|
[path.resolve('packages/c')]: {},
|
|
[path.resolve('packages/d')]: {},
|
|
},
|
|
}))
|
|
})
|