mirror of
https://github.com/pnpm/pnpm.git
synced 2026-05-13 19:16:21 -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.
100 lines
3.6 KiB
TypeScript
100 lines
3.6 KiB
TypeScript
/// <reference path="../../../__typings__/index.d.ts"/>
|
|
import path from 'node:path'
|
|
|
|
import { expect, test } from '@jest/globals'
|
|
import { readModulesManifest, type StrictModules, writeModulesManifest } from '@pnpm/installing.modules-yaml'
|
|
import isWindows from 'is-windows'
|
|
import { readYamlFileSync } from 'read-yaml-file'
|
|
import { temporaryDirectory } from 'tempy'
|
|
|
|
test('writeModulesManifest() and readModulesManifest()', async () => {
|
|
const modulesDir = temporaryDirectory()
|
|
const modulesYaml: StrictModules = {
|
|
hoistedDependencies: {},
|
|
included: {
|
|
dependencies: true,
|
|
devDependencies: true,
|
|
optionalDependencies: true,
|
|
},
|
|
ignoredBuilds: new Set(),
|
|
layoutVersion: 1,
|
|
packageManager: 'pnpm@2',
|
|
pendingBuilds: [],
|
|
publicHoistPattern: [],
|
|
prunedAt: new Date().toUTCString(),
|
|
registries: {
|
|
default: 'https://registry.npmjs.org/',
|
|
},
|
|
shamefullyHoist: false,
|
|
skipped: [],
|
|
storeDir: '/.pnpm-store',
|
|
virtualStoreDir: path.join(modulesDir, '.pnpm'),
|
|
virtualStoreDirMaxLength: 120,
|
|
}
|
|
await writeModulesManifest(modulesDir, modulesYaml)
|
|
expect(await readModulesManifest(modulesDir)).toEqual(modulesYaml)
|
|
|
|
const raw = readYamlFileSync<any>(path.join(modulesDir, '.modules.yaml')) // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
expect(raw.virtualStoreDir).toBeDefined()
|
|
expect(path.isAbsolute(raw.virtualStoreDir)).toEqual(isWindows())
|
|
})
|
|
|
|
test('backward compatible read of .modules.yaml created with shamefully-hoist=true', async () => {
|
|
const modulesYaml = await readModulesManifest(path.join(import.meta.dirname, 'fixtures/old-shamefully-hoist'))
|
|
if (modulesYaml == null) {
|
|
throw new Error('modulesYaml was nullish')
|
|
}
|
|
expect(modulesYaml.publicHoistPattern).toEqual(['*'])
|
|
expect(modulesYaml.hoistedDependencies).toEqual({
|
|
'/accepts/1.3.7': { accepts: 'public' },
|
|
'/array-flatten/1.1.1': { 'array-flatten': 'public' },
|
|
'/body-parser/1.19.0': { 'body-parser': 'public' },
|
|
})
|
|
})
|
|
|
|
test('backward compatible read of .modules.yaml created with shamefully-hoist=false', async () => {
|
|
const modulesYaml = await readModulesManifest(path.join(import.meta.dirname, 'fixtures/old-no-shamefully-hoist'))
|
|
if (modulesYaml == null) {
|
|
throw new Error('modulesYaml was nullish')
|
|
}
|
|
expect(modulesYaml.publicHoistPattern).toEqual([])
|
|
expect(modulesYaml.hoistedDependencies).toEqual({
|
|
'/accepts/1.3.7': { accepts: 'private' },
|
|
'/array-flatten/1.1.1': { 'array-flatten': 'private' },
|
|
'/body-parser/1.19.0': { 'body-parser': 'private' },
|
|
})
|
|
})
|
|
|
|
test('readModulesManifest() should create a node_modules directory', async () => {
|
|
const modulesDir = path.join(temporaryDirectory(), 'node_modules')
|
|
const modulesYaml: StrictModules = {
|
|
hoistedDependencies: {},
|
|
included: {
|
|
dependencies: true,
|
|
devDependencies: true,
|
|
optionalDependencies: true,
|
|
},
|
|
ignoredBuilds: new Set(),
|
|
layoutVersion: 1,
|
|
packageManager: 'pnpm@2',
|
|
pendingBuilds: [],
|
|
publicHoistPattern: [],
|
|
prunedAt: new Date().toUTCString(),
|
|
registries: {
|
|
default: 'https://registry.npmjs.org/',
|
|
},
|
|
shamefullyHoist: false,
|
|
skipped: [],
|
|
storeDir: '/.pnpm-store',
|
|
virtualStoreDir: path.join(modulesDir, '.pnpm'),
|
|
virtualStoreDirMaxLength: 120,
|
|
}
|
|
await writeModulesManifest(modulesDir, modulesYaml)
|
|
expect(await readModulesManifest(modulesDir)).toEqual(modulesYaml)
|
|
})
|
|
|
|
test('readModulesManifest does not fail on empty file', async () => {
|
|
const modulesYaml = await readModulesManifest(path.join(import.meta.dirname, 'fixtures/empty-modules-yaml'))
|
|
expect(modulesYaml).toBeUndefined()
|
|
})
|