mirror of
https://github.com/pnpm/pnpm.git
synced 2026-04-10 10:08:15 -04:00
Replaces the dual `authConfig` (raw .npmrc) + `authInfos` (parsed auth) + `sslConfigs` (parsed SSL) pattern with a single structured `configByUri: Record<string, RegistryConfig>` field on Config.
### New types (`@pnpm/types`)
- **`RegistryConfig`** — per-registry config: `{ creds?: Creds, tls?: TlsConfig }`
- **`Creds`** — auth credentials: `{ authToken?, basicAuth?, tokenHelper? }`
- **`TlsConfig`** — TLS config: `{ cert?, key?, ca? }`
### Key changes
- Rewrite `createGetAuthHeaderByURI` to accept `Record<string, RegistryConfig>` instead of raw .npmrc key-value pairs
- Eliminate duplicate auth parsing between `getAuthHeadersFromConfig` and `getNetworkConfigs`
- Remove `authConfig` from the install pipeline (`StrictInstallOptions`, `HeadlessOptions`), replaced by `configByUri`
- Remove `sslConfigs` from Config — SSL fields now live in `configByUri[uri].tls`
- Remove `authConfig['registry']` mutation in `extendInstallOptions` (default registry now passed directly to `createGetAuthHeaderByURI`)
- `authConfig` remains on Config only for raw .npmrc access (config commands, error reporting, config inheritance)
### Security
- tokenHelper in project .npmrc now throws instead of being silently stripped
- tokenHelper execution uses `shell: false` to prevent shell metacharacter injection
- Basic auth uses `Buffer.from().toString('base64')` instead of `btoa()` for Unicode safety
- Dispatcher only creates custom agents when entries actually have TLS fields
156 lines
3.8 KiB
TypeScript
156 lines
3.8 KiB
TypeScript
import fs from 'node:fs'
|
|
import path from 'node:path'
|
|
|
|
import { add, install, prune } from '@pnpm/installing.commands'
|
|
import { prepare } from '@pnpm/prepare'
|
|
import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
|
|
import { fixtures } from '@pnpm/test-fixtures'
|
|
import { createTestIpcServer } from '@pnpm/test-ipc-server'
|
|
import { symlinkDirSync } from 'symlink-dir'
|
|
|
|
const REGISTRY_URL = `http://localhost:${REGISTRY_MOCK_PORT}`
|
|
const f = fixtures(import.meta.dirname)
|
|
|
|
const DEFAULT_OPTIONS = {
|
|
argv: {
|
|
original: [],
|
|
},
|
|
bail: false,
|
|
bin: 'node_modules/.bin',
|
|
excludeLinksFromLockfile: false,
|
|
extraEnv: {},
|
|
cliOptions: {},
|
|
deployAllFiles: false,
|
|
include: {
|
|
dependencies: true,
|
|
devDependencies: true,
|
|
optionalDependencies: true,
|
|
},
|
|
lock: true,
|
|
linkWorkspacePackages: true,
|
|
pnpmfile: ['.pnpmfile.cjs'],
|
|
pnpmHomeDir: '',
|
|
preferWorkspacePackages: true,
|
|
configByUri: {},
|
|
registries: {
|
|
default: REGISTRY_URL,
|
|
},
|
|
rootProjectManifestDir: '',
|
|
sort: true,
|
|
userConfig: {},
|
|
workspaceConcurrency: 1,
|
|
virtualStoreDirMaxLength: process.platform === 'win32' ? 60 : 120,
|
|
}
|
|
|
|
test('prune removes external link that is not in package.json', async () => {
|
|
const project = prepare(undefined)
|
|
const storeDir = path.resolve('store')
|
|
f.copy('local-pkg', 'local')
|
|
|
|
symlinkDirSync(path.resolve('local'), path.join('node_modules/local-pkg'))
|
|
|
|
project.has('local-pkg')
|
|
|
|
await prune.handler({
|
|
...DEFAULT_OPTIONS,
|
|
cacheDir: path.resolve('cache'),
|
|
dir: process.cwd(),
|
|
storeDir,
|
|
})
|
|
|
|
project.hasNot('local-pkg')
|
|
})
|
|
|
|
test('prune keeps hoisted dependencies', async () => {
|
|
const project = prepare(undefined)
|
|
const storeDir = path.resolve('store')
|
|
const cacheDir = path.resolve('cache')
|
|
|
|
await add.handler({
|
|
...DEFAULT_OPTIONS,
|
|
cacheDir,
|
|
dir: process.cwd(),
|
|
storeDir,
|
|
}, ['@pnpm.e2e/pkg-with-1-dep@100.0.0'])
|
|
|
|
await prune.handler({
|
|
...DEFAULT_OPTIONS,
|
|
cacheDir,
|
|
dir: process.cwd(),
|
|
storeDir,
|
|
})
|
|
|
|
project.hasNot('@pnpm.e2e/dep-of-pkg-with-1-dep')
|
|
})
|
|
|
|
test('prune removes dev dependencies', async () => {
|
|
const project = prepare({
|
|
dependencies: { 'is-positive': '1.0.0' },
|
|
devDependencies: { 'is-negative': '1.0.0' },
|
|
})
|
|
const storeDir = path.resolve('store')
|
|
|
|
await install.handler({
|
|
...DEFAULT_OPTIONS,
|
|
cacheDir: path.resolve('cache'),
|
|
dir: process.cwd(),
|
|
linkWorkspacePackages: true,
|
|
storeDir,
|
|
})
|
|
|
|
await prune.handler({
|
|
...DEFAULT_OPTIONS,
|
|
cacheDir: path.resolve('cache'),
|
|
dev: false,
|
|
dir: process.cwd(),
|
|
storeDir,
|
|
})
|
|
|
|
project.has('is-positive')
|
|
project.has('.pnpm/is-positive@1.0.0')
|
|
project.hasNot('is-negative')
|
|
project.hasNot('.pnpm/is-negative@1.0.0')
|
|
})
|
|
|
|
test('prune: ignores all the lifecycle scripts when --ignore-scripts is used', async () => {
|
|
await using server = await createTestIpcServer()
|
|
|
|
prepare({
|
|
name: 'test-prune-with-ignore-scripts',
|
|
version: '0.0.0',
|
|
|
|
scripts: {
|
|
// eslint-disable:object-literal-sort-keys
|
|
preinstall: server.sendLineScript('preinstall'),
|
|
prepare: server.sendLineScript('prepare'),
|
|
postinstall: server.sendLineScript('postinstall'),
|
|
// eslint-enable:object-literal-sort-keys
|
|
},
|
|
})
|
|
|
|
const storeDir = path.resolve('store')
|
|
|
|
const opts = {
|
|
...DEFAULT_OPTIONS,
|
|
ignoreScripts: true,
|
|
cacheDir: path.resolve('cache'),
|
|
dir: process.cwd(),
|
|
linkWorkspacePackages: true,
|
|
storeDir,
|
|
}
|
|
|
|
await install.handler(opts)
|
|
|
|
await prune.handler(opts)
|
|
|
|
expect(fs.existsSync('package.json')).toBeTruthy()
|
|
expect(server.getLines()).toStrictEqual([])
|
|
})
|
|
|
|
test('cliOptionsTypes', () => {
|
|
expect(prune.cliOptionsTypes()).toHaveProperty('production')
|
|
expect(prune.cliOptionsTypes()).toHaveProperty('dev')
|
|
expect(prune.cliOptionsTypes()).toHaveProperty('ignore-scripts')
|
|
expect(prune.cliOptionsTypes()).toHaveProperty('optional')
|
|
})
|