mirror of
https://github.com/pnpm/pnpm.git
synced 2026-05-13 19:16:21 -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.
159 lines
4.8 KiB
TypeScript
159 lines
4.8 KiB
TypeScript
/// <reference path="../../../__typings__/index.d.ts" />
|
|
import path from 'node:path'
|
|
|
|
import { expect, test } from '@jest/globals'
|
|
import { assertProject } from '@pnpm/assert-project'
|
|
import { PnpmError } from '@pnpm/error'
|
|
import { importCommand } from '@pnpm/installing.commands'
|
|
import { prepare } from '@pnpm/prepare'
|
|
import { addDistTag, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
|
|
import { fixtures } from '@pnpm/test-fixtures'
|
|
import { temporaryDirectory } from 'tempy'
|
|
|
|
const f = fixtures(import.meta.dirname)
|
|
|
|
const REGISTRY = `http://localhost:${REGISTRY_MOCK_PORT}`
|
|
const TMP = temporaryDirectory()
|
|
|
|
const DEFAULT_OPTS = {
|
|
ca: undefined,
|
|
cacheDir: path.join(TMP, 'cache'),
|
|
cert: undefined,
|
|
fetchRetries: 2,
|
|
fetchRetryFactor: 90,
|
|
fetchRetryMaxtimeout: 90,
|
|
fetchRetryMintimeout: 10,
|
|
httpsProxy: undefined,
|
|
key: undefined,
|
|
localAddress: undefined,
|
|
lock: false,
|
|
lockStaleDuration: 90,
|
|
minimumReleaseAge: 0,
|
|
networkConcurrency: 16,
|
|
offline: false,
|
|
preferWorkspacePackages: true,
|
|
proxy: undefined,
|
|
pnpmHomeDir: '',
|
|
configByUri: {},
|
|
registries: { default: REGISTRY },
|
|
registry: REGISTRY,
|
|
rootProjectManifestDir: '',
|
|
storeDir: path.join(TMP, 'store'),
|
|
strictSsl: false,
|
|
userAgent: 'pnpm',
|
|
userConfig: {},
|
|
useRunningStoreServer: false,
|
|
useStoreServer: false,
|
|
virtualStoreDirMaxLength: process.platform === 'win32' ? 60 : 120,
|
|
}
|
|
|
|
test('import from package-lock.json', async () => {
|
|
await addDistTag({ package: '@pnpm.e2e/dep-of-pkg-with-1-dep', version: '100.1.0', distTag: 'latest' })
|
|
f.prepare('has-package-lock-json')
|
|
|
|
await importCommand.handler({
|
|
...DEFAULT_OPTS,
|
|
dir: process.cwd(),
|
|
}, [])
|
|
|
|
const project = assertProject(process.cwd())
|
|
const lockfile = project.readLockfile()
|
|
expect(lockfile.packages).toHaveProperty(['@pnpm.e2e/dep-of-pkg-with-1-dep@100.0.0'])
|
|
expect(lockfile.packages).not.toHaveProperty(['@pnpm.e2e/dep-of-pkg-with-1-dep@100.1.0'])
|
|
|
|
// node_modules is not created
|
|
project.hasNot('@pnpm.e2e/dep-of-pkg-with-1-dep')
|
|
project.hasNot('@pnpm.e2e/pkg-with-1-dep')
|
|
})
|
|
|
|
test('import from yarn.lock', async () => {
|
|
await addDistTag({ package: '@pnpm.e2e/dep-of-pkg-with-1-dep', version: '100.1.0', distTag: 'latest' })
|
|
|
|
f.prepare('has-yarn-lock')
|
|
|
|
await importCommand.handler({
|
|
...DEFAULT_OPTS,
|
|
dir: process.cwd(),
|
|
}, [])
|
|
|
|
const project = assertProject(process.cwd())
|
|
const lockfile = project.readLockfile()
|
|
expect(lockfile.packages).toHaveProperty(['@pnpm.e2e/dep-of-pkg-with-1-dep@100.0.0'])
|
|
expect(lockfile.packages).not.toHaveProperty(['@pnpm.e2e/dep-of-pkg-with-1-dep@100.1.0'])
|
|
|
|
// node_modules is not created
|
|
project.hasNot('@pnpm.e2e/dep-of-pkg-with-1-dep')
|
|
project.hasNot('@pnpm.e2e/pkg-with-1-dep')
|
|
})
|
|
|
|
test('import from yarn2 lock file', async () => {
|
|
f.prepare('has-yarn2-lock')
|
|
|
|
await importCommand.handler({
|
|
...DEFAULT_OPTS,
|
|
dir: process.cwd(),
|
|
}, [])
|
|
|
|
const project = assertProject(process.cwd())
|
|
const lockfile = project.readLockfile()
|
|
|
|
expect(lockfile.packages).toHaveProperty(['is-positive@1.0.0'])
|
|
expect(lockfile.packages).toHaveProperty(['is-negative@1.0.0'])
|
|
|
|
// node_modules is not created
|
|
project.hasNot('balanced-match')
|
|
project.hasNot('brace-expansion')
|
|
})
|
|
|
|
test('import from npm-shrinkwrap.json', async () => {
|
|
await addDistTag({ package: '@pnpm.e2e/dep-of-pkg-with-1-dep', version: '100.1.0', distTag: 'latest' })
|
|
|
|
f.prepare('has-npm-shrinkwrap-json')
|
|
|
|
await importCommand.handler({
|
|
...DEFAULT_OPTS,
|
|
dir: process.cwd(),
|
|
}, [])
|
|
|
|
const project = assertProject(process.cwd())
|
|
const lockfile = project.readLockfile()
|
|
expect(lockfile.packages).toHaveProperty(['@pnpm.e2e/dep-of-pkg-with-1-dep@100.0.0'])
|
|
expect(lockfile.packages).not.toHaveProperty(['@pnpm.e2e/dep-of-pkg-with-1-dep@100.1.0'])
|
|
|
|
// node_modules is not created
|
|
project.hasNot('@pnpm.e2e/dep-of-pkg-with-1-dep')
|
|
project.hasNot('@pnpm.e2e/pkg-with-1-dep')
|
|
})
|
|
|
|
test('import fails when no lockfiles are found', async () => {
|
|
prepare(undefined)
|
|
|
|
await expect(
|
|
importCommand.handler({
|
|
...DEFAULT_OPTS,
|
|
dir: process.cwd(),
|
|
}, [])
|
|
).rejects.toThrow(
|
|
new PnpmError('LOCKFILE_NOT_FOUND', 'No lockfile found')
|
|
)
|
|
})
|
|
|
|
test('import from package-lock.json v3', async () => {
|
|
await addDistTag({ package: '@pnpm.e2e/dep-of-pkg-with-1-dep', version: '100.1.0', distTag: 'latest' })
|
|
f.prepare('has-package-lock-v3-json')
|
|
|
|
await importCommand.handler({
|
|
...DEFAULT_OPTS,
|
|
dir: process.cwd(),
|
|
}, [])
|
|
|
|
const project = assertProject(process.cwd())
|
|
const lockfile = project.readLockfile()
|
|
expect(lockfile.packages).toHaveProperty(['@pnpm.e2e/dep-of-pkg-with-1-dep@100.0.0'])
|
|
expect(lockfile.packages).not.toHaveProperty(['@pnpm.e2e/dep-of-pkg-with-1-dep@100.1.0'])
|
|
|
|
// node_modules is not created
|
|
project.hasNot('@pnpm.e2e/dep-of-pkg-with-1-dep')
|
|
project.hasNot('@pnpm.e2e/pkg-with-1-dep')
|
|
})
|