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

feat: approve-builds works with global packages (#9095)

Browse Source
This commit is contained in:
Zoltan Kochan
2025-02-13 01:42:49 +01:00
committed by GitHub
parent 91d46eecd4
commit 4aa6d45e5c
3 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.changeset/metal-flowers-shake.md Normal file
View File

@@ -0,0 +1,7 @@
---
"@pnpm/default-reporter": minor
"@pnpm/exec.build-commands": minor
"pnpm": minor
---
`pnpm approve-builds --global` works now for allowing dependencies of globally installed packages to run postinstall scripts.

2
cli/default-reporter/src/reporterForClient/reportSummary.ts
View File

@@ -89,7 +89,7 @@ export function reportSummary (
if (ignoredScripts.packageNames && ignoredScripts.packageNames.length > 0 && !opts.pnpmConfig?.strictDepBuilds) {
msg += EOL
msg += boxen(`Ignored build scripts: ${Array.from(ignoredScripts.packageNames).sort().join(', ')}.
Run "pnpm approve-builds" to pick which dependencies should be allowed to run scripts.`, {
Run "pnpm approve-builds${opts.pnpmConfig?.cliOptions?.global ? ' -g' : ''}" to pick which dependencies should be allowed to run scripts.`, {
title: 'Warning',
padding: 1,
margin: 0,

31
exec/build-commands/src/approveBuilds.ts
View File

@@ -15,11 +15,26 @@ export function help (): string {
return renderHelp({
description: 'Approve dependencies for running scripts during installation',
usages: [],
descriptionLists: [
{
title: 'Options',
list: [
{
description: 'Approve dependencies of global packages',
name: '--global',
shortAlias: '-g',
},
],
},
],
})
}
export function cliOptionsTypes (): Record<string, unknown> {
return {}
return {
global: Boolean,
}
}
export function rcOptionsTypes (): Record<string, unknown> {
@@ -34,7 +49,7 @@ export async function handler (opts: ApproveBuildsCommandOpts & RebuildCommandOp
return
}
const { result } = await prompt({
choices: sortStrings([...automaticallyIgnoredBuilds]),
choices: sortUniqueStrings([...automaticallyIgnoredBuilds]),
indicator (state: any, choice: any) { // eslint-disable-line @typescript-eslint/no-explicit-any
return ` ${choice.enabled ? '●' : '○'}`
},
@@ -75,10 +90,10 @@ export async function handler (opts: ApproveBuildsCommandOpts & RebuildCommandOp
if (opts.rootProjectManifest.pnpm?.ignoredBuiltDependencies == null) {
opts.rootProjectManifest.pnpm = {
...opts.rootProjectManifest.pnpm,
ignoredBuiltDependencies: sortStrings(ignoredPackages),
ignoredBuiltDependencies: sortUniqueStrings(ignoredPackages),
}
} else {
opts.rootProjectManifest.pnpm.ignoredBuiltDependencies = sortStrings([
opts.rootProjectManifest.pnpm.ignoredBuiltDependencies = sortUniqueStrings([
...opts.rootProjectManifest.pnpm.ignoredBuiltDependencies,
...ignoredPackages,
])
@@ -88,10 +103,10 @@ export async function handler (opts: ApproveBuildsCommandOpts & RebuildCommandOp
if (opts.rootProjectManifest.pnpm?.onlyBuiltDependencies == null) {
opts.rootProjectManifest.pnpm = {
...opts.rootProjectManifest.pnpm,
onlyBuiltDependencies: sortStrings(buildPackages),
onlyBuiltDependencies: sortUniqueStrings(buildPackages),
}
} else {
opts.rootProjectManifest.pnpm.onlyBuiltDependencies = sortStrings([
opts.rootProjectManifest.pnpm.onlyBuiltDependencies = sortUniqueStrings([
...opts.rootProjectManifest.pnpm.onlyBuiltDependencies,
...buildPackages,
])
@@ -116,6 +131,6 @@ Do you approve?`,
}
}
function sortStrings (array: string[]): string[] {
return array.sort((a, b) => a.localeCompare(b))
function sortUniqueStrings (array: string[]): string[] {
return Array.from(new Set(array)).sort((a, b) => a.localeCompare(b))
}