mirror of
https://github.com/pnpm/pnpm.git
synced 2026-07-23 06:02:50 -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.
98 lines
3.3 KiB
TypeScript
98 lines
3.3 KiB
TypeScript
import path from 'node:path'
|
|
|
|
import { expect, jest, test } from '@jest/globals'
|
|
import {
|
|
addDependenciesToPackage,
|
|
install,
|
|
mutateModulesInSingleProject,
|
|
} from '@pnpm/installing.deps-installer'
|
|
import { prepareEmpty } from '@pnpm/prepare'
|
|
import { fixtures } from '@pnpm/test-fixtures'
|
|
import type { ProjectRootDir } from '@pnpm/types'
|
|
import { symlinkDirSync } from 'symlink-dir'
|
|
|
|
import { testDefaults } from './utils/index.js'
|
|
|
|
const f = fixtures(import.meta.dirname)
|
|
|
|
test('prune removes extraneous packages', async () => {
|
|
const linkedPkg = f.prepare('hello-world-js-bin')
|
|
const project = prepareEmpty()
|
|
|
|
const opts = testDefaults()
|
|
let { updatedManifest: manifest } = await addDependenciesToPackage({}, ['is-negative@2.1.0'], { ...opts, targetDependenciesField: 'dependencies' })
|
|
manifest = (await addDependenciesToPackage(manifest, ['applyq@0.2.1'], { ...opts, targetDependenciesField: 'devDependencies' })).updatedManifest
|
|
manifest = (await addDependenciesToPackage(manifest, ['fnumber@0.1.0'], { ...opts, targetDependenciesField: 'optionalDependencies' })).updatedManifest
|
|
manifest = (await addDependenciesToPackage(manifest, ['is-positive@2.0.0', '@zkochan/logger@0.1.0'], opts)).updatedManifest
|
|
symlinkDirSync(linkedPkg, path.resolve('node_modules/@pnpm.e2e/hello-world-js-bin'))
|
|
|
|
project.has('@pnpm.e2e/hello-world-js-bin') // external link added
|
|
|
|
delete manifest.dependencies!['is-positive']
|
|
delete manifest.dependencies!['@zkochan/logger']
|
|
|
|
const reporter = jest.fn()
|
|
|
|
await mutateModulesInSingleProject({
|
|
manifest,
|
|
mutation: 'install',
|
|
pruneDirectDependencies: true,
|
|
rootDir: process.cwd() as ProjectRootDir,
|
|
}, {
|
|
...opts,
|
|
pruneStore: true,
|
|
reporter,
|
|
})
|
|
|
|
expect(reporter).toHaveBeenCalledWith(expect.objectContaining({
|
|
level: 'debug',
|
|
name: 'pnpm:root',
|
|
removed: expect.objectContaining({
|
|
name: '@pnpm.e2e/hello-world-js-bin',
|
|
version: '1.0.0',
|
|
}),
|
|
}))
|
|
|
|
project.hasNot('@pnpm.e2e/hello-world-js-bin') // external link pruned
|
|
|
|
project.storeHasNot('is-positive', '2.0.0')
|
|
project.hasNot('is-positive')
|
|
|
|
project.storeHasNot('@zkochan/logger', '0.1.0')
|
|
project.hasNot('@zkochan/logger')
|
|
|
|
project.storeHas('is-negative', '2.1.0')
|
|
project.has('is-negative')
|
|
|
|
project.storeHas('applyq', '0.2.1')
|
|
project.has('applyq')
|
|
|
|
project.storeHas('fnumber', '0.1.0')
|
|
project.has('fnumber')
|
|
})
|
|
|
|
test('prune removes dev dependencies in production', async () => {
|
|
const project = prepareEmpty()
|
|
|
|
let { updatedManifest: manifest } = await addDependenciesToPackage({}, ['is-positive@2.0.0'], testDefaults({ targetDependenciesField: 'devDependencies' }))
|
|
manifest = (await addDependenciesToPackage(manifest, ['is-negative@2.1.0'], testDefaults({ targetDependenciesField: 'dependencies' }))).updatedManifest
|
|
manifest = (await addDependenciesToPackage(manifest, ['fnumber@0.1.0'], testDefaults({ targetDependenciesField: 'optionalDependencies' }))).updatedManifest
|
|
await install(manifest, testDefaults({
|
|
include: {
|
|
dependencies: true,
|
|
devDependencies: false,
|
|
optionalDependencies: true,
|
|
},
|
|
pruneStore: true,
|
|
}))
|
|
|
|
project.storeHasNot('is-positive', '2.0.0')
|
|
project.hasNot('is-positive')
|
|
|
|
project.storeHas('is-negative', '2.1.0')
|
|
project.has('is-negative')
|
|
|
|
project.storeHas('fnumber', '0.1.0')
|
|
project.has('fnumber')
|
|
})
|