mirror of
https://github.com/pnpm/pnpm.git
synced 2026-03-27 11:31:45 -04:00
## Summary Rename all internal packages so their npm names follow the `@pnpm/<domain>.<leaf>` convention, matching their directory structure. Also rename directories to remove redundancy and improve clarity. ### Bulk rename (94 packages) All `@pnpm/` packages now derive their name from their directory path using dot-separated segments. Exceptions: `packages/`, `__utils__/`, and `pnpm/artifacts/` keep leaf names only. ### Directory renames (removing redundant prefixes) - `cli/cli-meta` → `cli/meta`, `cli/cli-utils` → `cli/utils` - `config/config` → `config/reader`, `config/config-writer` → `config/writer` - `fetching/fetching-types` → `fetching/types` - `lockfile/lockfile-to-pnp` → `lockfile/to-pnp` - `store/store-connection-manager` → `store/connection-manager` - `store/store-controller-types` → `store/controller-types` - `store/store-path` → `store/path` ### Targeted renames (clarity improvements) - `deps/dependency-path` → `deps/path` (`@pnpm/deps.path`) - `deps/calc-dep-state` → `deps/graph-hasher` (`@pnpm/deps.graph-hasher`) - `deps/inspection/dependencies-hierarchy` → `deps/inspection/tree-builder` (`@pnpm/deps.inspection.tree-builder`) - `bins/link-bins` → `bins/linker`, `bins/remove-bins` → `bins/remover`, `bins/package-bins` → `bins/resolver` - `installing/get-context` → `installing/context` - `store/package-store` → `store/controller` - `pkg-manifest/manifest-utils` → `pkg-manifest/utils` ### Manifest reader/writer renames - `workspace/read-project-manifest` → `workspace/project-manifest-reader` (`@pnpm/workspace.project-manifest-reader`) - `workspace/write-project-manifest` → `workspace/project-manifest-writer` (`@pnpm/workspace.project-manifest-writer`) - `workspace/read-manifest` → `workspace/workspace-manifest-reader` (`@pnpm/workspace.workspace-manifest-reader`) - `workspace/manifest-writer` → `workspace/workspace-manifest-writer` (`@pnpm/workspace.workspace-manifest-writer`) ### Workspace package renames - `workspace/find-packages` → `workspace/projects-reader` - `workspace/find-workspace-dir` → `workspace/root-finder` - `workspace/resolve-workspace-range` → `workspace/range-resolver` - `workspace/filter-packages-from-dir` merged into `workspace/filter-workspace-packages` → `workspace/projects-filter` ### Domain moves - `pkg-manifest/read-project-manifest` → `workspace/project-manifest-reader` - `pkg-manifest/write-project-manifest` → `workspace/project-manifest-writer` - `pkg-manifest/exportable-manifest` → `releasing/exportable-manifest` ### Scope - 1206 files changed - Updated: package.json names/deps, TypeScript imports, tsconfig references, changeset files, renovate.json, test fixtures, import ordering
213 lines
6.8 KiB
TypeScript
213 lines
6.8 KiB
TypeScript
/// <reference path="../../../__typings__/index.d.ts"/>
|
|
import fs from 'node:fs'
|
|
import path from 'node:path'
|
|
|
|
import { createFetchFromRegistry } from '@pnpm/network.fetch'
|
|
import { ProxyServer } from 'https-proxy-server-express'
|
|
import nock from 'nock'
|
|
|
|
const CERTS_DIR = path.join(import.meta.dirname, '__certs__')
|
|
|
|
afterEach(() => {
|
|
nock.cleanAll()
|
|
})
|
|
|
|
test('fetchFromRegistry', async () => {
|
|
const fetchFromRegistry = createFetchFromRegistry({})
|
|
const res = await fetchFromRegistry('https://registry.npmjs.org/is-positive')
|
|
const metadata = await res.json() as any // eslint-disable-line
|
|
expect(metadata.name).toBe('is-positive')
|
|
expect(metadata.versions['1.0.0'].scripts).not.toBeTruthy()
|
|
})
|
|
|
|
test('fetchFromRegistry fullMetadata', async () => {
|
|
const fetchFromRegistry = createFetchFromRegistry({})
|
|
const res = await fetchFromRegistry('https://registry.npmjs.org/is-positive', { fullMetadata: true })
|
|
const metadata = await res.json() as any // eslint-disable-line
|
|
expect(metadata.name).toBe('is-positive')
|
|
expect(metadata.versions['1.0.0'].scripts).toBeTruthy()
|
|
})
|
|
|
|
test('authorization headers are removed before redirection if the target is on a different host', async () => {
|
|
nock('http://registry.pnpm.io/', {
|
|
reqheaders: { authorization: 'Bearer 123' },
|
|
})
|
|
.get('/is-positive')
|
|
.reply(302, '', { location: 'http://registry.other.org/is-positive' })
|
|
nock('http://registry.other.org/', { badheaders: ['authorization'] })
|
|
.get('/is-positive')
|
|
.reply(200, { ok: true })
|
|
|
|
const fetchFromRegistry = createFetchFromRegistry({})
|
|
const res = await fetchFromRegistry(
|
|
'http://registry.pnpm.io/is-positive',
|
|
{ authHeaderValue: 'Bearer 123' }
|
|
)
|
|
|
|
expect(await res.json()).toStrictEqual({ ok: true })
|
|
expect(nock.isDone()).toBeTruthy()
|
|
})
|
|
|
|
test('authorization headers are not removed before redirection if the target is on the same host', async () => {
|
|
nock('http://registry.pnpm.io/', {
|
|
reqheaders: { authorization: 'Bearer 123' },
|
|
})
|
|
.get('/is-positive')
|
|
.reply(302, '', { location: 'http://registry.pnpm.io/is-positive-new' })
|
|
nock('http://registry.pnpm.io/', {
|
|
reqheaders: { authorization: 'Bearer 123' },
|
|
})
|
|
.get('/is-positive-new')
|
|
.reply(200, { ok: true })
|
|
|
|
const fetchFromRegistry = createFetchFromRegistry({})
|
|
const res = await fetchFromRegistry(
|
|
'http://registry.pnpm.io/is-positive',
|
|
{ authHeaderValue: 'Bearer 123' }
|
|
)
|
|
|
|
expect(await res.json()).toStrictEqual({ ok: true })
|
|
expect(nock.isDone()).toBeTruthy()
|
|
})
|
|
|
|
test('switch to the correct agent for requests on redirect from http: to https:', async () => {
|
|
const fetchFromRegistry = createFetchFromRegistry({})
|
|
|
|
// We can test this on any endpoint that redirects from http: to https:
|
|
const { status } = await fetchFromRegistry('http://pnpm.io/pnpm.js')
|
|
|
|
expect(status).toBe(200)
|
|
})
|
|
|
|
test('fetch from registry with client certificate authentication', async () => {
|
|
const randomPort = Math.floor(Math.random() * 10000 + 10000)
|
|
const proxyServer = new ProxyServer(randomPort, {
|
|
key: fs.readFileSync(path.join(CERTS_DIR, 'server-key.pem')),
|
|
cert: fs.readFileSync(path.join(CERTS_DIR, 'server-crt.pem')),
|
|
ca: fs.readFileSync(path.join(CERTS_DIR, 'ca-crt.pem')),
|
|
rejectUnauthorized: true,
|
|
requestCert: true,
|
|
}, 'https://registry.npmjs.org/')
|
|
|
|
await proxyServer.start()
|
|
|
|
const sslConfigs = {
|
|
[`//localhost:${randomPort}/`]: {
|
|
ca: fs.readFileSync(path.join(CERTS_DIR, 'ca-crt.pem'), 'utf8'),
|
|
cert: fs.readFileSync(path.join(CERTS_DIR, 'client-crt.pem'), 'utf8'),
|
|
key: fs.readFileSync(path.join(CERTS_DIR, 'client-key.pem'), 'utf8'),
|
|
},
|
|
}
|
|
|
|
const fetchFromRegistry = createFetchFromRegistry({
|
|
sslConfigs,
|
|
strictSsl: false,
|
|
})
|
|
|
|
try {
|
|
const res = await fetchFromRegistry(`https://localhost:${randomPort}/is-positive`)
|
|
const metadata = await res.json() as any // eslint-disable-line
|
|
expect(metadata.name).toBe('is-positive')
|
|
} finally {
|
|
await proxyServer.stop()
|
|
}
|
|
})
|
|
|
|
test('fail if the client certificate is not provided', async () => {
|
|
const randomPort = Math.floor(Math.random() * 10000 + 10000)
|
|
const proxyServer = new ProxyServer(randomPort, {
|
|
key: fs.readFileSync(path.join(CERTS_DIR, 'server-key.pem')),
|
|
cert: fs.readFileSync(path.join(CERTS_DIR, 'server-crt.pem')),
|
|
ca: fs.readFileSync(path.join(CERTS_DIR, 'ca-crt.pem')),
|
|
rejectUnauthorized: true,
|
|
requestCert: true,
|
|
}, 'https://registry.npmjs.org/')
|
|
|
|
await proxyServer.start()
|
|
|
|
const fetchFromRegistry = createFetchFromRegistry({
|
|
strictSsl: false,
|
|
})
|
|
|
|
let err!: Error & { code: string }
|
|
try {
|
|
await fetchFromRegistry(`https://localhost:${randomPort}/is-positive`, {
|
|
retry: {
|
|
retries: 0,
|
|
},
|
|
})
|
|
} catch (_err: any) { // eslint-disable-line
|
|
err = _err
|
|
} finally {
|
|
await proxyServer.stop()
|
|
}
|
|
expect(err?.code).toMatch(/ECONNRESET|ERR_SSL_TLSV13_ALERT_CERTIFICATE_REQUIRED/)
|
|
})
|
|
|
|
test('redirect to protocol-relative URL', async () => {
|
|
nock('http://registry.pnpm.io/')
|
|
.get('/foo')
|
|
.reply(302, '', { location: '//registry.other.org/foo' })
|
|
nock('http://registry.other.org/')
|
|
.get('/foo')
|
|
.reply(200, { ok: true })
|
|
|
|
const fetchFromRegistry = createFetchFromRegistry({})
|
|
const res = await fetchFromRegistry(
|
|
'http://registry.pnpm.io/foo'
|
|
)
|
|
|
|
expect(await res.json()).toStrictEqual({ ok: true })
|
|
expect(nock.isDone()).toBeTruthy()
|
|
})
|
|
|
|
test('redirect to relative URL', async () => {
|
|
nock('http://registry.pnpm.io/')
|
|
.get('/bar/baz')
|
|
.reply(302, '', { location: '../foo' })
|
|
nock('http://registry.pnpm.io/')
|
|
.get('/foo')
|
|
.reply(200, { ok: true })
|
|
|
|
const fetchFromRegistry = createFetchFromRegistry({})
|
|
const res = await fetchFromRegistry(
|
|
'http://registry.pnpm.io/bar/baz'
|
|
)
|
|
|
|
expect(await res.json()).toStrictEqual({ ok: true })
|
|
expect(nock.isDone()).toBeTruthy()
|
|
})
|
|
|
|
test('redirect to relative URL when request pkg.pr.new link', async () => {
|
|
nock('https://pkg.pr.new/')
|
|
.get('/vue@14175')
|
|
.reply(302, '', { location: '/vuejs/core/vue@14182' })
|
|
|
|
nock('https://pkg.pr.new/')
|
|
.get('/vuejs/core/vue@14182')
|
|
.reply(302, '', { location: '/vuejs/core/vue@82a13bb6faaa9f77a06b57e69e0934b9f620f333' })
|
|
|
|
nock('https://pkg.pr.new/')
|
|
.get('/vuejs/core/vue@82a13bb6faaa9f77a06b57e69e0934b9f620f333')
|
|
.reply(200, { ok: true })
|
|
|
|
const fetchFromRegistry = createFetchFromRegistry({})
|
|
const res = await fetchFromRegistry(
|
|
'https://pkg.pr.new/vue@14175'
|
|
)
|
|
|
|
expect(await res.json()).toStrictEqual({ ok: true })
|
|
expect(nock.isDone()).toBeTruthy()
|
|
})
|
|
|
|
test('redirect without location header throws error', async () => {
|
|
nock('http://registry.pnpm.io/')
|
|
.get('/missing-location')
|
|
.reply(302, 'found')
|
|
|
|
const fetchFromRegistry = createFetchFromRegistry({})
|
|
await expect(fetchFromRegistry(
|
|
'http://registry.pnpm.io/missing-location'
|
|
)).rejects.toThrow(/Redirect location header missing/)
|
|
})
|