mirror of
https://github.com/pnpm/pnpm.git
synced 2026-06-30 19:05:23 -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.
184 lines
5.8 KiB
TypeScript
184 lines
5.8 KiB
TypeScript
import fs from 'node:fs'
|
|
|
|
import { expect, test } from '@jest/globals'
|
|
import { installConfigDeps } from '@pnpm/installing.env-installer'
|
|
import { createEnvLockfile, type EnvLockfile, readEnvLockfile } from '@pnpm/lockfile.fs'
|
|
import { prepareEmpty } from '@pnpm/prepare'
|
|
import { getIntegrity, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
|
|
import { createTempStore } from '@pnpm/testing.temp-store'
|
|
import { loadJsonFileSync } from 'load-json-file'
|
|
|
|
const registry = `http://localhost:${REGISTRY_MOCK_PORT}/`
|
|
|
|
function makeEnvLockfile (deps: Record<string, { version: string, integrity: string }>): EnvLockfile {
|
|
const lockfile = createEnvLockfile()
|
|
for (const [name, { version, integrity }] of Object.entries(deps)) {
|
|
const pkgKey = `${name}@${version}`
|
|
lockfile.importers['.'].configDependencies[name] = { specifier: version, version }
|
|
lockfile.packages[pkgKey] = { resolution: { integrity } }
|
|
lockfile.snapshots[pkgKey] = {}
|
|
}
|
|
return lockfile
|
|
}
|
|
|
|
test('configuration dependency is installed from env lockfile', async () => {
|
|
prepareEmpty()
|
|
const { storeController, storeDir } = createTempStore()
|
|
|
|
const lockfile = makeEnvLockfile({
|
|
'@pnpm.e2e/foo': { version: '100.0.0', integrity: getIntegrity('@pnpm.e2e/foo', '100.0.0') },
|
|
})
|
|
await installConfigDeps(lockfile, {
|
|
registries: {
|
|
default: registry,
|
|
},
|
|
rootDir: process.cwd(),
|
|
store: storeController,
|
|
storeDir,
|
|
})
|
|
|
|
{
|
|
const configDepManifest = loadJsonFileSync<{ name: string, version: string }>('node_modules/.pnpm-config/@pnpm.e2e/foo/package.json')
|
|
expect(configDepManifest.name).toBe('@pnpm.e2e/foo')
|
|
expect(configDepManifest.version).toBe('100.0.0')
|
|
// The local path should be a symlink to the global virtual store
|
|
expect(fs.lstatSync('node_modules/.pnpm-config/@pnpm.e2e/foo').isSymbolicLink()).toBe(true)
|
|
}
|
|
|
|
// Dependency is updated
|
|
const lockfile2 = makeEnvLockfile({
|
|
'@pnpm.e2e/foo': { version: '100.1.0', integrity: getIntegrity('@pnpm.e2e/foo', '100.1.0') },
|
|
})
|
|
|
|
await installConfigDeps(lockfile2, {
|
|
registries: {
|
|
default: registry,
|
|
},
|
|
rootDir: process.cwd(),
|
|
store: storeController,
|
|
storeDir,
|
|
})
|
|
|
|
{
|
|
const configDepManifest = loadJsonFileSync<{ name: string, version: string }>('node_modules/.pnpm-config/@pnpm.e2e/foo/package.json')
|
|
expect(configDepManifest.name).toBe('@pnpm.e2e/foo')
|
|
expect(configDepManifest.version).toBe('100.1.0')
|
|
}
|
|
|
|
// Dependency is removed
|
|
const lockfile3 = createEnvLockfile()
|
|
|
|
await installConfigDeps(lockfile3, {
|
|
registries: {
|
|
default: registry,
|
|
},
|
|
rootDir: process.cwd(),
|
|
store: storeController,
|
|
storeDir,
|
|
})
|
|
|
|
expect(fs.existsSync('node_modules/.pnpm-config/@pnpm.e2e/foo/package.json')).toBeFalsy()
|
|
})
|
|
|
|
test('installation fails if the checksum of the config dependency is invalid', async () => {
|
|
prepareEmpty()
|
|
const { storeController, storeDir } = createTempStore({
|
|
clientOptions: {
|
|
retry: {
|
|
retries: 0,
|
|
},
|
|
},
|
|
})
|
|
|
|
const lockfile = makeEnvLockfile({
|
|
'@pnpm.e2e/foo': {
|
|
version: '100.0.0',
|
|
integrity: 'sha512-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000==',
|
|
},
|
|
})
|
|
await expect(installConfigDeps(lockfile, {
|
|
registries: {
|
|
default: registry,
|
|
},
|
|
rootDir: process.cwd(),
|
|
store: storeController,
|
|
storeDir,
|
|
})).rejects.toThrow('Got unexpected checksum for')
|
|
})
|
|
|
|
test('migration: installs from old inline integrity format and creates env lockfile', async () => {
|
|
prepareEmpty()
|
|
const { storeController, storeDir } = createTempStore()
|
|
|
|
// Old format: ConfigDependencies with inline integrity
|
|
const integrity = getIntegrity('@pnpm.e2e/foo', '100.0.0')
|
|
const configDeps: Record<string, string> = {
|
|
'@pnpm.e2e/foo': `100.0.0+${integrity}`,
|
|
}
|
|
await installConfigDeps(configDeps, {
|
|
registries: {
|
|
default: registry,
|
|
},
|
|
rootDir: process.cwd(),
|
|
store: storeController,
|
|
storeDir,
|
|
})
|
|
|
|
{
|
|
const configDepManifest = loadJsonFileSync<{ name: string, version: string }>('node_modules/.pnpm-config/@pnpm.e2e/foo/package.json')
|
|
expect(configDepManifest.name).toBe('@pnpm.e2e/foo')
|
|
expect(configDepManifest.version).toBe('100.0.0')
|
|
}
|
|
|
|
// Verify env lockfile was created with expected content in pnpm-lock.yaml
|
|
const envLockfile = (await readEnvLockfile(process.cwd()))!
|
|
expect(envLockfile.lockfileVersion).toBeDefined()
|
|
expect(envLockfile.importers['.'].configDependencies['@pnpm.e2e/foo']).toEqual({
|
|
specifier: '100.0.0',
|
|
version: '100.0.0',
|
|
})
|
|
expect((envLockfile.packages['@pnpm.e2e/foo@100.0.0'].resolution as { integrity: string }).integrity).toBe(integrity)
|
|
})
|
|
|
|
test('migration fails with frozenLockfile when no env lockfile exists', async () => {
|
|
prepareEmpty()
|
|
const { storeController, storeDir } = createTempStore()
|
|
|
|
const integrity = getIntegrity('@pnpm.e2e/foo', '100.0.0')
|
|
const configDeps: Record<string, string> = {
|
|
'@pnpm.e2e/foo': `100.0.0+${integrity}`,
|
|
}
|
|
await expect(installConfigDeps(configDeps, {
|
|
registries: {
|
|
default: registry,
|
|
},
|
|
rootDir: process.cwd(),
|
|
store: storeController,
|
|
storeDir,
|
|
frozenLockfile: true,
|
|
})).rejects.toThrow('Cannot migrate configDependencies with "frozen-lockfile"')
|
|
})
|
|
|
|
test('installation fails if the config dependency does not have a checksum (old format)', async () => {
|
|
prepareEmpty()
|
|
const { storeController, storeDir } = createTempStore({
|
|
clientOptions: {
|
|
retry: {
|
|
retries: 0,
|
|
},
|
|
},
|
|
})
|
|
|
|
const configDeps: Record<string, string> = {
|
|
'@pnpm.e2e/foo': '100.0.0',
|
|
}
|
|
await expect(installConfigDeps(configDeps, {
|
|
registries: {
|
|
default: registry,
|
|
},
|
|
rootDir: process.cwd(),
|
|
store: storeController,
|
|
storeDir,
|
|
})).rejects.toThrow('already in clean-specifier form')
|
|
})
|