mirror of
https://github.com/pnpm/pnpm.git
synced 2026-05-19 14:20:36 -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.
235 lines
5.2 KiB
TypeScript
235 lines
5.2 KiB
TypeScript
import path from 'node:path'
|
|
|
|
import { expect, test } from '@jest/globals'
|
|
import { add } from '@pnpm/installing.commands'
|
|
import { prepare } from '@pnpm/prepare'
|
|
import { loadJsonFileSync } from 'load-json-file'
|
|
|
|
import { DEFAULT_OPTS } from './utils/index.js'
|
|
|
|
// This must be a function because some of its values depend on CWD
|
|
const createOptions = (jsr: string = 'https://npm.jsr.io/') => ({
|
|
...DEFAULT_OPTS,
|
|
configByUri: {},
|
|
registries: {
|
|
...DEFAULT_OPTS.registries,
|
|
'@jsr': jsr,
|
|
},
|
|
dir: process.cwd(),
|
|
cacheDir: path.resolve('cache'),
|
|
storeDir: path.resolve('store'),
|
|
})
|
|
|
|
test('pnpm add jsr:@<scope>/<name>', async () => {
|
|
const project = prepare({
|
|
name: 'test-add-jsr',
|
|
version: '0.0.0',
|
|
private: true,
|
|
})
|
|
|
|
await add.handler(createOptions(), ['jsr:@pnpm-e2e/foo'])
|
|
|
|
expect(loadJsonFileSync('package.json')).toMatchObject({
|
|
dependencies: {
|
|
'@pnpm-e2e/foo': 'jsr:^0.1.0',
|
|
},
|
|
})
|
|
|
|
expect(project.readLockfile()).toMatchObject({
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'@pnpm-e2e/foo': {
|
|
specifier: 'jsr:^0.1.0',
|
|
version: '@jsr/pnpm-e2e__foo@0.1.0',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
packages: {
|
|
'@jsr/pnpm-e2e__foo@0.1.0': {
|
|
resolution: {
|
|
integrity: expect.any(String),
|
|
},
|
|
},
|
|
},
|
|
snapshots: {
|
|
'@jsr/pnpm-e2e__foo@0.1.0': expect.any(Object),
|
|
},
|
|
})
|
|
})
|
|
|
|
test('pnpm add jsr:@<scope>/<name> --save-peer writes a valid peer range', async () => {
|
|
prepare()
|
|
|
|
await add.handler({
|
|
...createOptions(),
|
|
savePeer: true,
|
|
}, ['jsr:@pnpm-e2e/foo'])
|
|
|
|
expect(loadJsonFileSync('package.json')).toMatchObject({
|
|
devDependencies: {
|
|
'@pnpm-e2e/foo': 'jsr:^0.1.0',
|
|
},
|
|
peerDependencies: {
|
|
'@pnpm-e2e/foo': '^0.1.0',
|
|
},
|
|
})
|
|
})
|
|
|
|
test('pnpm add jsr:@<scope>/<name>@latest', async () => {
|
|
const project = prepare({
|
|
name: 'test-add-jsr',
|
|
version: '0.0.0',
|
|
private: true,
|
|
})
|
|
|
|
await add.handler(createOptions(), ['jsr:@pnpm-e2e/foo@latest'])
|
|
|
|
expect(loadJsonFileSync('package.json')).toMatchObject({
|
|
dependencies: {
|
|
'@pnpm-e2e/foo': 'jsr:^0.1.0',
|
|
},
|
|
})
|
|
|
|
expect(project.readLockfile()).toMatchObject({
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'@pnpm-e2e/foo': {
|
|
specifier: 'jsr:^0.1.0',
|
|
version: '@jsr/pnpm-e2e__foo@0.1.0',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
packages: {
|
|
'@jsr/pnpm-e2e__foo@0.1.0': {
|
|
resolution: {
|
|
integrity: expect.any(String),
|
|
},
|
|
},
|
|
},
|
|
snapshots: {
|
|
'@jsr/pnpm-e2e__foo@0.1.0': expect.any(Object),
|
|
},
|
|
})
|
|
})
|
|
|
|
test('pnpm add jsr:@<scope>/<name>@<version_selector>', async () => {
|
|
const project = prepare({
|
|
name: 'test-add-jsr',
|
|
version: '0.0.0',
|
|
private: true,
|
|
})
|
|
|
|
await add.handler(createOptions(), ['jsr:@pnpm-e2e/foo@0.1'])
|
|
|
|
expect(loadJsonFileSync('package.json')).toMatchObject({
|
|
dependencies: {
|
|
'@pnpm-e2e/foo': 'jsr:~0.1.0',
|
|
},
|
|
})
|
|
|
|
expect(project.readLockfile()).toMatchObject({
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'@pnpm-e2e/foo': {
|
|
specifier: 'jsr:~0.1.0',
|
|
version: '@jsr/pnpm-e2e__foo@0.1.0',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
packages: {
|
|
'@jsr/pnpm-e2e__foo@0.1.0': {
|
|
resolution: {
|
|
integrity: expect.any(String),
|
|
},
|
|
},
|
|
},
|
|
snapshots: {
|
|
'@jsr/pnpm-e2e__foo@0.1.0': expect.any(Object),
|
|
},
|
|
})
|
|
})
|
|
|
|
test('pnpm add <alias>@jsr:@<scope>/<name>', async () => {
|
|
const project = prepare({
|
|
name: 'test-add-jsr',
|
|
version: '0.0.0',
|
|
private: true,
|
|
})
|
|
|
|
await add.handler(createOptions(), ['foo-from-jsr@jsr:@pnpm-e2e/foo'])
|
|
|
|
expect(loadJsonFileSync('package.json')).toMatchObject({
|
|
dependencies: {
|
|
'foo-from-jsr': 'jsr:@pnpm-e2e/foo@^0.1.0',
|
|
},
|
|
})
|
|
|
|
expect(project.readLockfile()).toMatchObject({
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'foo-from-jsr': {
|
|
specifier: 'jsr:@pnpm-e2e/foo@^0.1.0',
|
|
version: '@jsr/pnpm-e2e__foo@0.1.0',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
packages: {
|
|
'@jsr/pnpm-e2e__foo@0.1.0': {
|
|
resolution: {
|
|
integrity: expect.any(String),
|
|
},
|
|
},
|
|
},
|
|
snapshots: {
|
|
'@jsr/pnpm-e2e__foo@0.1.0': expect.any(Object),
|
|
},
|
|
})
|
|
})
|
|
|
|
test('pnpm add <alias>@jsr:@<scope>/<name>@<version_selector>', async () => {
|
|
const project = prepare({
|
|
name: 'test-add-jsr',
|
|
version: '0.0.0',
|
|
private: true,
|
|
})
|
|
|
|
await add.handler(createOptions(), ['foo-from-jsr@jsr:@pnpm-e2e/foo@0.1'])
|
|
|
|
expect(loadJsonFileSync('package.json')).toMatchObject({
|
|
dependencies: {
|
|
'foo-from-jsr': 'jsr:@pnpm-e2e/foo@~0.1.0',
|
|
},
|
|
})
|
|
|
|
expect(project.readLockfile()).toMatchObject({
|
|
importers: {
|
|
'.': {
|
|
dependencies: {
|
|
'foo-from-jsr': {
|
|
specifier: 'jsr:@pnpm-e2e/foo@~0.1.0',
|
|
version: '@jsr/pnpm-e2e__foo@0.1.0',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
packages: {
|
|
'@jsr/pnpm-e2e__foo@0.1.0': {
|
|
resolution: {
|
|
integrity: expect.any(String),
|
|
},
|
|
},
|
|
},
|
|
snapshots: {
|
|
'@jsr/pnpm-e2e__foo@0.1.0': expect.any(Object),
|
|
},
|
|
})
|
|
})
|