mirror/pnpm
1
0
Fork 0
mirror of https://github.com/pnpm/pnpm.git synced 2025-12-24 07:38:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: add a function for corepack context detection

Browse Source
This commit is contained in:
Zoltan Kochan
2024-08-02 23:01:04 +02:00
parent cb006df38c
commit 64e2e4f86f
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/sixty-bulldogs-pretend.md Normal file
View File

@@ -0,0 +1,5 @@
---
"@pnpm/cli-meta": minor
---
Added isExecutedByCorepack.

4
cli/cli-meta/src/index.ts
View File

@@ -39,3 +39,7 @@ export const packageManager = {
export function detectIfCurrentPkgIsExecutable (proc: NodeJS.Process = process): boolean {
return 'pkg' in proc && proc.pkg != null
}
export function isExecutedByCorepack (env: NodeJS.ProcessEnv = process.env): boolean {
return env.COREPACK_ROOT != null
}

4
cli/cli-utils/src/packageIsInstallable.ts
View File

@@ -1,5 +1,5 @@
import { PnpmError } from '@pnpm/error'
import { packageManager } from '@pnpm/cli-meta'
import { isExecutedByCorepack, packageManager } from '@pnpm/cli-meta'
import { logger, globalWarn } from '@pnpm/logger'
import { checkPackage, UnsupportedEngineError, type WantedEngine } from '@pnpm/package-is-installable'
import { type SupportedArchitectures } from '@pnpm/types'
@@ -24,7 +24,7 @@ export function packageIsInstallable (
const currentPnpmVersion = packageManager.name === 'pnpm'
? packageManager.version
: undefined
if (pkg.packageManager && !process.env.COREPACK_ROOT) {
if (pkg.packageManager && !isExecutedByCorepack()) {
const [pmName, pmReference] = pkg.packageManager.split('@')
if (pmName && pmName !== 'pnpm') {
const msg = `This project is configured to use ${pmName}`

4
cli/default-reporter/src/reporterForClient/reportUpdateCheck.ts
View File

@@ -1,5 +1,5 @@
import { type UpdateCheckLog } from '@pnpm/core-loggers'
import { detectIfCurrentPkgIsExecutable } from '@pnpm/cli-meta'
import { detectIfCurrentPkgIsExecutable, isExecutedByCorepack } from '@pnpm/cli-meta'
import boxen from 'boxen'
import chalk from 'chalk'
import * as Rx from 'rxjs'
@@ -54,7 +54,7 @@ function renderUpdateMessage (opts: UpdateMessageOptions): string {
}
function renderUpdateCommand (opts: UpdateMessageOptions): string {
if (opts.env.COREPACK_ROOT) {
if (isExecutedByCorepack(opts.env)) {
return `corepack install -g pnpm@${opts.latestVersion}`
}
const pkgName = opts.currentPkgIsExecutable ? '@pnpm/exe' : 'pnpm'