mirror/pnpm
1
0
Fork 0
mirror of https://github.com/pnpm/pnpm.git synced 2026-05-08 07:54:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't print useless warnings about conflicting binaries

Browse Source 
ref #1471
PR #2442
This commit is contained in:
Zoltan Kochan
2020-03-29 01:05:06 +02:00
committed by GitHub
parent 952361ba42
commit 3130bf712b
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/hoist/src/index.ts
View File

@@ -1,5 +1,5 @@
import { WANTED_LOCKFILE } from '@pnpm/constants'
import linkBins from '@pnpm/link-bins'
import linkBins, { WarnFunction } from '@pnpm/link-bins'
import {
Lockfile,
nameVerFromPkgSnapshot,
@@ -62,7 +62,10 @@ export default async function hoistByLockfile (
})
const bin = path.join(opts.modulesDir, '.bin')
const warn = (message: string) => logger.warn({ message, prefix: path.join(opts.modulesDir, '../..') })
const warn: WarnFunction = (message, code) => {
if (code === 'BINARIES_CONFLICT') return
logger.warn({ message, prefix: path.join(opts.modulesDir, '../..') })
}
try {
await linkBins(opts.modulesDir, bin, { allowExoticManifests: true, warn })
} catch (err) {

8
packages/link-bins/src/index.ts
View File

@@ -19,7 +19,9 @@ const IS_WINDOWS = isWindows()
const EXECUTABLE_SHEBANG_SUPPORTED = !IS_WINDOWS
const POWER_SHELL_IS_SUPPORTED = IS_WINDOWS
export type WarnFunction = (msg: string) => void
export type WarningCode = 'BINARIES_CONFLICT' | 'EMPTY_BIN'
export type WarnFunction = (msg: string, code: WarningCode) => void
export default async (
modulesDir: string,
@@ -94,7 +96,7 @@ async function linkBins (
const usedNames = R.fromPairs(cmdsWithOwnName.map((cmd) => [cmd.name, cmd.name] as R.KeyValuePair<string, string>))
const results2 = await pSettle(cmdsWithOtherNames.map((cmd: Command & {pkgName: string}) => {
if (usedNames[cmd.name]) {
opts.warn(`Cannot link bin "${cmd.name}" of "${cmd.pkgName}" to "${binsDir}". A package called "${usedNames[cmd.name]}" already has its bin linked.`)
opts.warn(`Cannot link binary '${cmd.name}' of '${cmd.pkgName}' to '${binsDir}': binary of '${usedNames[cmd.name]}' is already linked`, 'BINARIES_CONFLICT')
return Promise.resolve(undefined)
}
usedNames[cmd.name] = cmd.pkgName
@@ -133,7 +135,7 @@ async function getPackageBins (
}
if (R.isEmpty(manifest.bin) && !await isFromModules(target)) {
opts.warn(`Package in ${target} must have a non-empty bin field to get bin linked.`)
opts.warn(`Package in ${target} must have a non-empty bin field to get bin linked.`, 'EMPTY_BIN')
}
if (typeof manifest.bin === 'string' && !manifest.name) {

4
packages/link-bins/test/index.ts
View File

@@ -167,7 +167,7 @@ test('linkBins() resolves conflicts. Prefer packages that use their name as bin
await linkBins(path.join(binNameConflictsFixture, 'node_modules'), binTarget, { warn })
t.ok(warn.calledWith(`Cannot link bin "bar" of "foo" to "${binTarget}". A package called "bar" already has its bin linked.`))
t.equal(warn.args[0][0], `Cannot link binary 'bar' of 'foo' to '${binTarget}': binary of 'bar' is already linked`)
t.deepEqual(await fs.readdir(binTarget), getExpectedBins(['bar', 'foofoo']))
{
@@ -209,7 +209,7 @@ test('linkBinsOfPackages() resolves conflicts. Prefer packages that use their na
{ warn },
)
t.ok(warn.calledWith(`Cannot link bin "bar" of "foo" to "${binTarget}". A package called "bar" already has its bin linked.`))
t.equal(warn.args[0][0], `Cannot link binary 'bar' of 'foo' to '${binTarget}': binary of 'bar' is already linked`)
t.deepEqual(await fs.readdir(binTarget), getExpectedBins(['bar', 'foofoo']))
{