mirror of
https://github.com/pnpm/pnpm.git
synced 2026-02-08 14:12:44 -05:00
fix: only the add command should fail if there is no bin directory in PATH (#5842)
close #5841
This commit is contained in:
7
.changeset/spicy-panthers-agree.md
Normal file
7
.changeset/spicy-panthers-agree.md
Normal file
@@ -0,0 +1,7 @@
|
||||
---
|
||||
"@pnpm/config": patch
|
||||
"@pnpm/plugin-commands-installation": patch
|
||||
"pnpm": patch
|
||||
---
|
||||
|
||||
Only the `pnpm add --global <pkg>` command should fail if there is no global pnpm bin directory in the system PATH [#5841](https://github.com/pnpm/pnpm/issues/5841).
|
||||
@@ -316,10 +316,6 @@ export async function getConfig (
|
||||
if (pnpmConfig.bin) {
|
||||
fs.mkdirSync(pnpmConfig.bin, { recursive: true })
|
||||
await checkGlobalBinDir(pnpmConfig.bin, { env, shouldAllowWrite: opts.globalDirShouldAllowWrite })
|
||||
} else {
|
||||
throw new PnpmError('NO_GLOBAL_BIN_DIR', 'Unable to find the global bin directory', {
|
||||
hint: 'Run "pnpm setup" to create it automatically, or set the global-bin-dir setting, or the PNPM_HOME env variable. The global bin directory should be in the PATH.',
|
||||
})
|
||||
}
|
||||
pnpmConfig.save = true
|
||||
pnpmConfig.allowNew = true
|
||||
|
||||
@@ -193,6 +193,11 @@ export async function handler (
|
||||
'If you don\'t want to see this warning anymore, you may set the ignore-workspace-root-check setting to true.'
|
||||
)
|
||||
}
|
||||
if (opts.global && !opts.bin) {
|
||||
throw new PnpmError('NO_GLOBAL_BIN_DIR', 'Unable to find the global bin directory', {
|
||||
hint: 'Run "pnpm setup" to create it automatically, or set the global-bin-dir setting, or the PNPM_HOME env variable. The global bin directory should be in the PATH.',
|
||||
})
|
||||
}
|
||||
|
||||
const include = {
|
||||
dependencies: opts.production !== false,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import path from 'path'
|
||||
import { PnpmError } from '@pnpm/error'
|
||||
import { add, remove } from '@pnpm/plugin-commands-installation'
|
||||
import { prepare, preparePackages } from '@pnpm/prepare'
|
||||
import { prepare, prepareEmpty, preparePackages } from '@pnpm/prepare'
|
||||
import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
|
||||
import loadJsonFile from 'load-json-file'
|
||||
import tempy from 'tempy'
|
||||
@@ -330,3 +330,23 @@ test('pnpm add automatically installs missing peer dependencies', async () => {
|
||||
const lockfile = await project.readLockfile()
|
||||
expect(Object.keys(lockfile.packages).length).toBe(5)
|
||||
})
|
||||
|
||||
test('add: fail when global bin directory is not found', async () => {
|
||||
prepareEmpty()
|
||||
|
||||
let err!: PnpmError
|
||||
try {
|
||||
await add.handler({
|
||||
...DEFAULT_OPTIONS,
|
||||
bin: undefined as any, // eslint-disable-line
|
||||
dir: path.resolve('project-1'),
|
||||
global: true,
|
||||
linkWorkspacePackages: false,
|
||||
saveWorkspaceProtocol: false,
|
||||
workspace: true,
|
||||
}, ['@pnpm.e2e/hello-world-js-bin'])
|
||||
} catch (_err: any) { // eslint-disable-line
|
||||
err = _err
|
||||
}
|
||||
expect(err.code).toBe('ERR_PNPM_NO_GLOBAL_BIN_DIR')
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user