mirror of
https://github.com/pnpm/pnpm.git
synced 2026-05-18 13:51:38 -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.
54 lines
2.4 KiB
TypeScript
54 lines
2.4 KiB
TypeScript
import fs from 'node:fs'
|
|
|
|
import { expect, test } from '@jest/globals'
|
|
import { addDependenciesToPackage } from '@pnpm/installing.deps-installer'
|
|
import { prepareEmpty } from '@pnpm/prepare'
|
|
import { loadJsonFileSync } from 'load-json-file'
|
|
|
|
import { testDefaults } from './utils/index.js'
|
|
|
|
test('packageImportMethod can be set to copy', async () => {
|
|
const project = prepareEmpty()
|
|
|
|
await addDependenciesToPackage({}, ['is-negative'], testDefaults({ fastUnpack: false }, {}, {}, { packageImportMethod: 'copy' }))
|
|
|
|
const m = project.requireModule('is-negative')
|
|
expect(m).toBeTruthy() // is-negative is available with packageImportMethod = copy
|
|
})
|
|
|
|
test('copy does not fail on package that self-requires itself', async () => {
|
|
const project = prepareEmpty()
|
|
|
|
await addDependenciesToPackage({}, ['@pnpm.e2e/requires-itself'], testDefaults({}, {}, {}, { packageImportMethod: 'copy' }))
|
|
|
|
const m = project.requireModule('@pnpm.e2e/requires-itself/package.json')
|
|
expect(m).toBeTruthy() // requires-itself is available with packageImportMethod = copy
|
|
|
|
const lockfile = project.readLockfile()
|
|
expect(lockfile.snapshots['@pnpm.e2e/requires-itself@1.0.0'].dependencies).toStrictEqual({ 'is-positive': '1.0.0' })
|
|
})
|
|
|
|
test('packages are updated in node_modules, when packageImportMethod is set to copy and modules manifest and current lockfile are incorrect', async () => {
|
|
prepareEmpty()
|
|
const opts = testDefaults({ fastUnpack: false, force: false, nodeLinker: 'hoisted' }, {}, {}, { packageImportMethod: 'copy' })
|
|
|
|
await addDependenciesToPackage({}, ['is-negative@1.0.0'], opts)
|
|
const modulesManifestContent = fs.readFileSync('node_modules/.modules.yaml')
|
|
const currentLockfile = fs.readFileSync('node_modules/.pnpm/lock.yaml')
|
|
{
|
|
const pkg = loadJsonFileSync<any>('node_modules/is-negative/package.json') // eslint-disable-line
|
|
expect(pkg.version).toBe('1.0.0')
|
|
}
|
|
await addDependenciesToPackage({}, ['is-negative@2.0.0'], opts)
|
|
{
|
|
const pkg = loadJsonFileSync<any>('node_modules/is-negative/package.json') // eslint-disable-line
|
|
expect(pkg.version).toBe('2.0.0')
|
|
}
|
|
fs.writeFileSync('node_modules/.modules.yaml', modulesManifestContent, 'utf8')
|
|
fs.writeFileSync('node_modules/.pnpm/lock.yaml', currentLockfile, 'utf8')
|
|
await addDependenciesToPackage({}, ['is-negative@1.0.0'], opts)
|
|
|
|
const pkg = loadJsonFileSync<any>('node_modules/is-negative/package.json') // eslint-disable-line
|
|
expect(pkg.version).toBe('1.0.0')
|
|
})
|