mirror/pnpm
1
0
Fork 0
mirror of https://github.com/pnpm/pnpm.git synced 2026-05-31 12:10:49 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
dependabot/github_actions/github-actions-48d2ea223b
pnpm/installing/commands/test/update/recursive.ts
Zoltan Kochan ae2175829a feat(registry-access): extract dist-tag + adduser helpers, dogfood from tests (#11926) 
* feat(registry-access): extract setDistTag and dogfood from tests

Add `@pnpm/registry-access.commands#setDistTag` — the low-level PUT to
`/-/package/:pkg/dist-tags/:tag`. The CLI `dist-tag add` handler now
calls it instead of issuing the fetch inline.

Tests in this monorepo now use a thin new package
`@pnpm/testing.registry-mock` (REGISTRY_MOCK_PORT + REGISTRY_MOCK_CREDENTIALS
baked in) that delegates to `setDistTag`, replacing `addDistTag` from
`@pnpm/registry-mock`. That dropped helper relied on
`anonymous-npm-registry-client` and a verdaccio-era
fetch-then-DELETE-then-PUT dance that is no longer needed against
pnpm-registry.

39 test files swapped from `@pnpm/registry-mock` to
`@pnpm/testing.registry-mock`.

* fix: move setDistTag to its own package to break tsconfig project-reference cycle

testing/registry-mock → registry-access.commands → releasing/commands
→ installing/commands → installing/deps-installer → testing/registry-mock.

Extract setDistTag into @pnpm/registry-access.set-dist-tag (only depends
on @pnpm/error, @pnpm/network.fetch, @pnpm/npm-package-arg). Both
@pnpm/registry-access.commands and @pnpm/testing.registry-mock import
from it. Cycle gone.

* feat(registry-access): extract addUser helper, dogfood from login + tests

Add @pnpm/registry-access.add-user — a small helper that PUTs to
/-/user/org.couchdb.user:<name> and returns { token }. The CLI's
classicLogin (pnpm login fallback path) now calls it, and tests
use it via @pnpm/testing.registry-mock instead of the legacy
addUser from @pnpm/registry-mock.

Swapped 3 call sites: globalSetup.js, installing/deps-installer's
auth.ts, and pnpm/test/dlx.ts. AddUserHttpError exposes status +
text + parsed-json-if-applicable + headers so the CLI can still
do its OTP detection. One webauth-OTP login test mock had to be
adjusted to provide its body via `text` (JSON-stringified) rather
than `json` only, since the helper consumes the body via `text()`.

* refactor: consolidate set-dist-tag + add-user helpers into one @pnpm/registry-access.client package

One shared package is better than splitting per endpoint. Future endpoints
(publish, deprecate, etc.) can land here without another wrapper.

No behavioral change — same setDistTag and addUser exports as before,
just under one roof. Callers updated: registry-access.commands,
auth.commands, testing.registry-mock.

* fix(registry-access): sort imports
2026-05-25 14:01:00 +02:00

446 lines
12 KiB
TypeScript
Raw Permalink Blame History

import { expect, test } from '@jest/globals'
import type { PnpmError } from '@pnpm/error'
import { install, update } from '@pnpm/installing.commands'
import { readModulesManifest } from '@pnpm/installing.modules-yaml'
import type { LockfileObject } from '@pnpm/lockfile.types'
import { preparePackages } from '@pnpm/prepare'
import { addDistTag } from '@pnpm/testing.registry-mock'
import { readProjectManifestOnly } from '@pnpm/workspace.project-manifest-reader'
import { filterProjectsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter'
import { readYamlFileSync } from 'read-yaml-file'
import { DEFAULT_OPTS } from '../utils/index.js'
test('recursive update', async () => {
const projects = preparePackages([
{
name: 'project-1',
version: '1.0.0',
dependencies: {
'is-positive': '1.0.0',
},
},
{
name: 'project-2',
version: '1.0.0',
dependencies: {
'is-negative': '1.0.0',
},
},
])
const { allProjects, selectedProjectsGraph } = await filterProjectsBySelectorObjectsFromDir(process.cwd(), [])
await install.handler({
...DEFAULT_OPTS,
allProjects,
dir: process.cwd(),
recursive: true,
selectedProjectsGraph,
workspaceDir: process.cwd(),
})
await update.handler({
...DEFAULT_OPTS,
allProjects,
dir: process.cwd(),
recursive: true,
selectedProjectsGraph,
workspaceDir: process.cwd(),
}, ['is-positive@2.0.0'])
expect(projects['project-1'].requireModule('is-positive/package.json').version).toBe('2.0.0')
projects['project-2'].hasNot('is-positive')
})
test('recursive update prod dependencies only', async () => {
await addDistTag({ package: '@pnpm.e2e/foo', version: '100.0.0', distTag: 'latest' })
await addDistTag({ package: '@pnpm.e2e/bar', version: '100.0.0', distTag: 'latest' })
preparePackages([
{
name: 'project-1',
version: '1.0.0',
dependencies: {
'@pnpm.e2e/foo': '^100.0.0',
},
},
{
name: 'project-2',
version: '1.0.0',
devDependencies: {
'@pnpm.e2e/bar': '^100.0.0',
},
},
])
const { allProjects, selectedProjectsGraph } = await filterProjectsBySelectorObjectsFromDir(process.cwd(), [])
await install.handler({
...DEFAULT_OPTS,
allProjects,
dir: process.cwd(),
lockfileDir: process.cwd(),
recursive: true,
selectedProjectsGraph,
workspaceDir: process.cwd(),
})
await addDistTag({ package: '@pnpm.e2e/foo', version: '100.1.0', distTag: 'latest' })
await addDistTag({ package: '@pnpm.e2e/bar', version: '100.1.0', distTag: 'latest' })
await update.handler({
...DEFAULT_OPTS,
allProjects,
cliOptions: {
optional: false,
production: true,
},
dir: process.cwd(),
lockfileDir: process.cwd(),
recursive: true,
selectedProjectsGraph,
workspaceDir: process.cwd(),
})
const lockfile = readYamlFileSync<LockfileObject>('./pnpm-lock.yaml')
expect(
Object.keys(lockfile.packages ?? {})
).toStrictEqual(
['@pnpm.e2e/bar@100.0.0', '@pnpm.e2e/foo@100.1.0']
)
const modules = await readModulesManifest('./node_modules')
expect(modules?.included).toStrictEqual({
dependencies: true,
devDependencies: true,
optionalDependencies: true,
})
})
test('recursive update with pattern', async () => {
const projects = preparePackages([
{
name: 'project-1',
version: '1.0.0',
dependencies: {
'@pnpm.e2e/dep-of-pkg-with-1-dep': '100.0.0',
'@pnpm.e2e/foo': '1.0.0',
},
},
{
name: 'project-2',
version: '1.0.0',
dependencies: {
'@pnpm.e2e/peer-c': '1.0.0',
},
},
])
const { allProjects, selectedProjectsGraph } = await filterProjectsBySelectorObjectsFromDir(process.cwd(), [])
await install.handler({
...DEFAULT_OPTS,
allProjects,
dir: process.cwd(),
recursive: true,
selectedProjectsGraph,
workspaceDir: process.cwd(),
})
await addDistTag({ package: '@pnpm.e2e/dep-of-pkg-with-1-dep', version: '100.1.0', distTag: 'latest' })
await addDistTag({ package: '@pnpm.e2e/peer-c', version: '2.0.0', distTag: 'latest' })
await addDistTag({ package: '@pnpm.e2e/foo', version: '2.0.0', distTag: 'latest' })
await update.handler({
...DEFAULT_OPTS,
allProjects,
dir: process.cwd(),
latest: true,
recursive: true,
selectedProjectsGraph,
workspaceDir: process.cwd(),
}, ['@pnpm.e2e/peer-*', '@pnpm.e2e/dep-of-pkg-*'])
expect(projects['project-1'].requireModule('@pnpm.e2e/dep-of-pkg-with-1-dep/package.json').version).toBe('100.1.0')
expect(projects['project-1'].requireModule('@pnpm.e2e/foo/package.json').version).toBe('1.0.0')
expect(projects['project-2'].requireModule('@pnpm.e2e/peer-c/package.json').version).toBe('2.0.0')
})
test('recursive update with pattern and name in project', async () => {
await addDistTag({ package: '@pnpm.e2e/dep-of-pkg-with-1-dep', version: '100.1.0', distTag: 'latest' })
await addDistTag({ package: '@pnpm.e2e/peer-c', version: '2.0.0', distTag: 'latest' })
await addDistTag({ package: '@pnpm.e2e/foo', version: '2.0.0', distTag: 'latest' })
await addDistTag({ package: '@pnpm.e2e/print-version', version: '2.0.0', distTag: 'latest' })
const projects = preparePackages([
{
name: 'project-1',
version: '1.0.0',
dependencies: {
'@pnpm.e2e/dep-of-pkg-with-1-dep': '100.0.0',
'@pnpm.e2e/foo': '1.0.0',
},
},
{
name: 'project-2',
version: '1.0.0',
dependencies: {
'@pnpm.e2e/peer-c': '1.0.0',
'@pnpm.e2e/print-version': '1.0.0',
},
},
])
const lockfileDir = process.cwd()
const { allProjects, selectedProjectsGraph } = await filterProjectsBySelectorObjectsFromDir(process.cwd(), [])
await install.handler({
...DEFAULT_OPTS,
allProjects,
dir: process.cwd(),
lockfileDir,
recursive: true,
selectedProjectsGraph,
workspaceDir: process.cwd(),
})
let err!: PnpmError
try {
await update.handler({
...DEFAULT_OPTS,
allProjects,
depth: 0,
dir: process.cwd(),
latest: true,
lockfileDir,
recursive: true,
selectedProjectsGraph,
workspaceDir: process.cwd(),
}, ['@pnpm.e2e/this-does-not-exist'])
} catch (_err: any) { // eslint-disable-line
err = _err
}
expect(err).toBeTruthy()
expect(err.code).toBe('ERR_PNPM_NO_PACKAGE_IN_DEPENDENCIES')
// This should not fail because depth=0 is not specified
await update.handler({
...DEFAULT_OPTS,
allProjects,
dir: process.cwd(),
latest: true,
lockfileDir,
recursive: true,
selectedProjectsGraph,
workspaceDir: process.cwd(),
}, ['@pnpm.e2e/this-does-not-exist'])
await update.handler({
...DEFAULT_OPTS,
allProjects,
dir: process.cwd(),
latest: true,
lockfileDir,
recursive: true,
selectedProjectsGraph,
workspaceDir: process.cwd(),
}, ['@pnpm.e2e/peer-*', '@pnpm.e2e/dep-of-pkg-*', '@pnpm.e2e/print-version'])
expect(projects['project-1'].requireModule('@pnpm.e2e/dep-of-pkg-with-1-dep/package.json').version).toBe('100.1.0')
expect(projects['project-1'].requireModule('@pnpm.e2e/foo/package.json').version).toBe('1.0.0')
expect(projects['project-2'].requireModule('@pnpm.e2e/peer-c/package.json').version).toBe('2.0.0')
expect(projects['project-2'].requireModule('@pnpm.e2e/print-version/package.json').version).toBe('2.0.0')
})
test('recursive update --latest foo should only update projects that have foo', async () => {
await addDistTag({ package: '@pnpm.e2e/foo', version: '100.0.0', distTag: 'latest' })
await addDistTag({ package: '@pnpm.e2e/bar', version: '100.0.0', distTag: 'latest' })
await addDistTag({ package: '@pnpm.e2e/qar', version: '100.0.0', distTag: 'latest' })
preparePackages([
{
name: 'project-1',
version: '1.0.0',
dependencies: {
'@pnpm.e2e/foo': '100.0.0',
'@pnpm.e2e/qar': '100.0.0',
},
},
{
name: 'project-2',
version: '1.0.0',
dependencies: {
'@zkochan/async-regex-replace': '0.1.0',
'@pnpm.e2e/bar': '^100.0.0',
},
},
])
const lockfileDir = process.cwd()
const { allProjects, selectedProjectsGraph } = await filterProjectsBySelectorObjectsFromDir(process.cwd(), [])
await install.handler({
...DEFAULT_OPTS,
allProjects,
dir: process.cwd(),
lockfileDir,
recursive: true,
selectedProjectsGraph,
workspaceDir: process.cwd(),
})
await addDistTag({ package: '@pnpm.e2e/foo', version: '100.1.0', distTag: 'latest' })
await addDistTag({ package: '@pnpm.e2e/bar', version: '100.1.0', distTag: 'latest' })
await update.handler({
...DEFAULT_OPTS,
allProjects,
dir: process.cwd(),
latest: true,
lockfileDir,
recursive: true,
selectedProjectsGraph,
workspaceDir: process.cwd(),
}, ['@zkochan/async-regex-replace', '@pnpm.e2e/foo'])
const lockfile = readYamlFileSync<LockfileObject>('./pnpm-lock.yaml')
expect(Object.keys(lockfile.packages ?? {}).sort()).toStrictEqual([
'@zkochan/async-regex-replace@0.2.0',
'@pnpm.e2e/bar@100.0.0',
'@pnpm.e2e/foo@100.1.0',
'@pnpm.e2e/qar@100.0.0',
].sort())
})
test('recursive update --latest foo should only update packages that have foo', async () => {
await addDistTag({ package: '@pnpm.e2e/foo', version: '100.0.0', distTag: 'latest' })
await addDistTag({ package: '@pnpm.e2e/bar', version: '100.0.0', distTag: 'latest' })
await addDistTag({ package: '@pnpm.e2e/qar', version: '100.0.0', distTag: 'latest' })
const projects = preparePackages([
{
name: 'project-1',
version: '1.0.0',
dependencies: {
'@pnpm.e2e/foo': '100.0.0',
'@pnpm.e2e/qar': '100.0.0',
},
},
{
name: 'project-2',
version: '1.0.0',
dependencies: {
'@pnpm.e2e/bar': '^100.0.0',
},
},
])
const { allProjects, selectedProjectsGraph } = await filterProjectsBySelectorObjectsFromDir(process.cwd(), [])
await install.handler({
...DEFAULT_OPTS,
allProjects,
dir: process.cwd(),
recursive: true,
selectedProjectsGraph,
workspaceDir: process.cwd(),
})
await addDistTag({ package: '@pnpm.e2e/foo', version: '100.1.0', distTag: 'latest' })
await addDistTag({ package: '@pnpm.e2e/bar', version: '100.1.0', distTag: 'latest' })
await update.handler({
...DEFAULT_OPTS,
allProjects,
dir: process.cwd(),
latest: true,
recursive: true,
selectedProjectsGraph,
workspaceDir: process.cwd(),
}, ['@pnpm.e2e/foo'])
{
const lockfile = projects['project-1'].readLockfile()
expect(Object.keys(lockfile.packages ?? {})).toStrictEqual(['@pnpm.e2e/foo@100.1.0', '@pnpm.e2e/qar@100.0.0'])
}
{
const lockfile = projects['project-2'].readLockfile()
expect(Object.keys(lockfile.packages ?? {})).toStrictEqual(['@pnpm.e2e/bar@100.0.0'])
}
})
test('recursive update in workspace should not add new dependencies', async () => {
const projects = preparePackages([
{
name: 'project-1',
version: '1.0.0',
},
{
name: 'project-2',
version: '1.0.0',
},
])
let err!: PnpmError
try {
await update.handler({
...DEFAULT_OPTS,
...await filterProjectsBySelectorObjectsFromDir(process.cwd(), []),
depth: 0,
dir: process.cwd(),
recursive: true,
workspaceDir: process.cwd(),
}, ['is-positive'])
} catch (_err: any) { // eslint-disable-line
err = _err
}
expect(err).toBeTruthy()
expect(err.code).toBe('ERR_PNPM_NO_PACKAGE_IN_DEPENDENCIES')
projects['project-1'].hasNot('is-positive')
projects['project-2'].hasNot('is-positive')
})
test('recursive update with aliased workspace dependency (#7975)', async () => {
const projects = preparePackages([
{
name: 'project-1',
version: '1.0.0',
dependencies: {
pkg: 'workspace:project-2@^',
},
},
{
name: 'project-2',
version: '1.0.0',
},
])
await update.handler({
...DEFAULT_OPTS,
...await filterProjectsBySelectorObjectsFromDir(process.cwd(), []),
depth: 0,
dir: process.cwd(),
recursive: true,
workspaceDir: process.cwd(),
saveWorkspaceProtocol: 'rolling',
})
projects['project-1'].has('pkg')
const manifest = await readProjectManifestOnly('project-1')
expect(manifest).toHaveProperty(['dependencies', 'pkg'], 'workspace:project-2@^')
})
Reference in New Issue View Git Blame Copy Permalink