mirror of
https://github.com/pnpm/pnpm.git
synced 2026-05-14 03:26:13 -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.
210 lines
7.3 KiB
TypeScript
210 lines
7.3 KiB
TypeScript
import fs from 'node:fs'
|
|
import path from 'node:path'
|
|
|
|
import { describe, expect, test } from '@jest/globals'
|
|
import { dedupe, install } from '@pnpm/installing.commands'
|
|
import { DedupeCheckIssuesError } from '@pnpm/installing.dedupe.check'
|
|
import type { LockfileObject } from '@pnpm/lockfile.types'
|
|
import { prepare } from '@pnpm/prepare'
|
|
import { fixtures } from '@pnpm/test-fixtures'
|
|
import { createTestIpcServer } from '@pnpm/test-ipc-server'
|
|
import { filterProjectsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter'
|
|
import { diff } from 'jest-diff'
|
|
import { readYamlFileSync } from 'read-yaml-file'
|
|
|
|
import { DEFAULT_OPTS } from './utils/index.js'
|
|
|
|
const f = fixtures(import.meta.dirname)
|
|
|
|
const noColor = (str: string) => str
|
|
const diffOptsForLockfile = {
|
|
// Avoid showing common lines to make the snapshot smaller and less noisy.
|
|
// https://github.com/facebook/jest/tree/05deb8393c4ad71/packages/jest-diff#example-of-options-to-limit-common-lines
|
|
contextLines: 3,
|
|
expand: false,
|
|
|
|
// Remove color from snapshots
|
|
// https://github.com/facebook/jest/tree/05deb8393c4ad71/packages/jest-diff#example-of-options-for-no-colors
|
|
aColor: noColor,
|
|
bColor: noColor,
|
|
changeColor: noColor,
|
|
commonColor: noColor,
|
|
patchColor: noColor,
|
|
}
|
|
|
|
describe('pnpm dedupe', () => {
|
|
test('updates old resolutions from importers block and removes old packages', async () => {
|
|
const { originalLockfile, dedupedLockfile, dedupeCheckError } = await testFixture('workspace-with-lockfile-dupes')
|
|
// Many old packages should be deleted as result of deduping. See snapshot file for details.
|
|
expect(diff(originalLockfile, dedupedLockfile, diffOptsForLockfile)).toMatchSnapshot()
|
|
expect(dedupeCheckError.dedupeCheckIssues).toEqual({
|
|
importerIssuesByImporterId: {
|
|
added: [],
|
|
removed: [],
|
|
updated: {
|
|
'packages/bar': {
|
|
ajv: {
|
|
next: '6.12.6',
|
|
prev: '6.10.2',
|
|
type: 'updated',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
packageIssuesByDepPath: {
|
|
added: [],
|
|
removed: [
|
|
'ajv@6.10.2',
|
|
'fast-deep-equal@2.0.1',
|
|
'fast-json-stable-stringify@2.0.0',
|
|
'punycode@2.1.1',
|
|
'uri-js@4.2.2',
|
|
],
|
|
updated: {},
|
|
},
|
|
})
|
|
})
|
|
|
|
test('updates old resolutions from package block', async () => {
|
|
const { originalLockfile, dedupedLockfile, dedupeCheckError } = await testFixture('workspace-with-lockfile-subdep-dupes')
|
|
// This is a smaller scale test that should just update uri-js@4.2.2 to
|
|
// punycode@2.3.0 and remove punycode@2.1.1. See snapshot file for details.
|
|
expect(diff(originalLockfile, dedupedLockfile, diffOptsForLockfile)).toMatchSnapshot()
|
|
expect(dedupeCheckError.dedupeCheckIssues).toEqual({
|
|
importerIssuesByImporterId: {
|
|
added: [],
|
|
removed: [],
|
|
updated: {},
|
|
},
|
|
packageIssuesByDepPath: {
|
|
added: [],
|
|
removed: [
|
|
'punycode@2.1.1',
|
|
],
|
|
updated: {
|
|
'uri-js@4.2.2': {
|
|
punycode: {
|
|
next: '2.3.0',
|
|
prev: '2.1.1',
|
|
type: 'updated',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
})
|
|
})
|
|
|
|
test('dedupe: ignores all the lifecycle scripts when --ignore-scripts is used', async () => {
|
|
await using server = await createTestIpcServer()
|
|
|
|
const project = prepare({
|
|
name: 'test-dedupe-with-ignore-scripts',
|
|
version: '0.0.0',
|
|
|
|
scripts: {
|
|
// eslint-disable:object-literal-sort-keys
|
|
preinstall: server.sendLineScript('preinstall'),
|
|
prepare: server.sendLineScript('prepare'),
|
|
postinstall: server.sendLineScript('postinstall'),
|
|
// eslint-enable:object-literal-sort-keys
|
|
},
|
|
})
|
|
|
|
const opts = {
|
|
...DEFAULT_OPTS,
|
|
recursive: true,
|
|
dir: project.dir(),
|
|
ignoreScripts: true,
|
|
lockfileDir: project.dir(),
|
|
workspaceDir: project.dir(),
|
|
}
|
|
|
|
await install.handler(opts)
|
|
|
|
await dedupe.handler(opts)
|
|
|
|
expect(fs.existsSync('package.json')).toBeTruthy()
|
|
expect(server.getLines()).toStrictEqual([])
|
|
})
|
|
|
|
describe('cliOptionsTypes', () => {
|
|
test('trivially contains command line arguments from install command', () => {
|
|
// Using --store-dir and --registry as a gut check to ensure the "pnpm
|
|
// dedupe" command accepts most CLI options that "pnpm install" accepts.
|
|
expect(dedupe.cliOptionsTypes()).toHaveProperty('store-dir')
|
|
expect(dedupe.cliOptionsTypes()).toHaveProperty('registry')
|
|
})
|
|
|
|
test('does not accept --frozen-lockfile', () => {
|
|
// This option doesn't make sense on pnpm dedupe. Ensure it's not
|
|
// accidentally inherited from the install command after future refactors.
|
|
expect(dedupe.cliOptionsTypes()).not.toHaveProperty('--frozen-lockfile')
|
|
})
|
|
})
|
|
})
|
|
|
|
async function testFixture (fixtureName: string) {
|
|
const project = prepare(undefined)
|
|
f.copy(fixtureName, project.dir())
|
|
|
|
const { allProjects, selectedProjectsGraph } = await filterProjectsBySelectorObjectsFromDir(project.dir(), [])
|
|
|
|
const opts = {
|
|
...DEFAULT_OPTS,
|
|
allProjects,
|
|
selectedProjectsGraph,
|
|
recursive: true,
|
|
dir: project.dir(),
|
|
lockfileDir: project.dir(),
|
|
workspaceDir: project.dir(),
|
|
resolutionMode: 'highest' as const, // TODO: this should work with the default resolution mode (TODOv8)
|
|
}
|
|
|
|
const readProjectLockfile = () => readYamlFileSync<LockfileObject>(path.join(project.dir(), './pnpm-lock.yaml'))
|
|
|
|
const originalLockfile = readProjectLockfile()
|
|
|
|
// Sanity check that this test is set up correctly by ensuring the lockfile is
|
|
// unmodified after a regular install.
|
|
await install.handler(opts)
|
|
expect(readProjectLockfile()).toEqual(originalLockfile)
|
|
|
|
let dedupeCheckError: DedupeCheckIssuesError | undefined
|
|
try {
|
|
await dedupe.handler({ ...opts, check: true })
|
|
} catch (err: unknown) {
|
|
expect(err).toBeInstanceOf(DedupeCheckIssuesError)
|
|
dedupeCheckError = err as DedupeCheckIssuesError
|
|
} finally {
|
|
// The dedupe check option should never change the lockfile.
|
|
expect(readProjectLockfile()).toEqual(originalLockfile)
|
|
}
|
|
|
|
if (dedupeCheckError == null) {
|
|
throw new Error('Expected change report from pnpm dedupe --check')
|
|
}
|
|
|
|
// The lockfile fixture has several packages that could be removed after
|
|
// re-resolving versions.
|
|
await dedupe.handler(opts)
|
|
|
|
const dedupedLockfile = readProjectLockfile()
|
|
|
|
// It should be possible to remove packages from the fixture lockfile.
|
|
const originalLockfilePackageNames = Object.keys(originalLockfile.packages ?? {})
|
|
const dedupedLockfilePackageNames = Object.keys(dedupedLockfile.packages ?? {})
|
|
expect(dedupedLockfilePackageNames.length).toBeLessThan(originalLockfilePackageNames.length)
|
|
|
|
// The "pnpm dedupe" command should only remove packages when the lockfile is
|
|
// up to date. Ensure no new packages/dependencies were added.
|
|
expect(originalLockfilePackageNames).toEqual(expect.arrayContaining(dedupedLockfilePackageNames))
|
|
|
|
// Run pnpm install one last time to ensure the deduped lockfile is in a good
|
|
// state. If so, the "pnpm install" command should pass successfully and not
|
|
// make any further edits to the lockfile.
|
|
await install.handler(opts)
|
|
expect(readProjectLockfile()).toEqual(dedupedLockfile)
|
|
|
|
return { originalLockfile, dedupedLockfile, dedupeCheckError }
|
|
}
|