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(config): new global packages location in beta mode (#3781)

Browse Source
This commit is contained in:
Zoltan Kochan
2021-09-21 03:01:59 +03:00
committed by GitHub
parent 6cc1aa2c00
commit d62259d677
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/tasty-birds-know.md Normal file
View File

@@ -0,0 +1,5 @@
---
"@pnpm/config": minor
---
Use a subfolder of the pnpm homedir as the location of globally installed packages, when use-beta-cli is on.

29
packages/config/src/index.ts
View File

@@ -258,22 +258,28 @@ export default async (
pnpmConfig.sharedWorkspaceLockfile = typeof pnpmConfig['sharedWorkspaceLockfile'] === 'undefined'
? pnpmConfig.sharedWorkspaceShrinkwrap
: pnpmConfig['sharedWorkspaceLockfile']
pnpmConfig.pnpmHomeDir = getDataDir(process)
if (cliOptions['global']) {
const knownGlobalBinDirCandidates: string[] = []
let npmGlobalPrefix: string = findBestGlobalPrefix(npmConfig.globalPrefix, process.env)
const globalDirName = `${path.sep}${PNPM_GLOBAL}${path.sep}`
if (npmGlobalPrefix.includes(globalDirName)) {
npmGlobalPrefix = npmGlobalPrefix.substring(0, npmGlobalPrefix.indexOf(globalDirName))
let globalDirRoot
if (pnpmConfig['globalDir']) {
globalDirRoot = pnpmConfig['globalDir']
} else if (pnpmConfig.useBetaCli) {
globalDirRoot = path.join(pnpmConfig.pnpmHomeDir, 'global-packages')
} else {
const npmGlobalBinDir = process.platform === 'win32'
? npmGlobalPrefix
: path.resolve(npmGlobalPrefix, 'bin')
knownGlobalBinDirCandidates.push(npmGlobalBinDir)
let npmGlobalPrefix: string = findBestGlobalPrefix(npmConfig.globalPrefix, process.env)
const globalDirName = `${path.sep}${PNPM_GLOBAL}${path.sep}`
if (npmGlobalPrefix.includes(globalDirName)) {
npmGlobalPrefix = npmGlobalPrefix.substring(0, npmGlobalPrefix.indexOf(globalDirName))
} else {
const npmGlobalBinDir = process.platform === 'win32'
? npmGlobalPrefix
: path.resolve(npmGlobalPrefix, 'bin')
knownGlobalBinDirCandidates.push(npmGlobalBinDir)
}
globalDirRoot = path.join(firstWithWriteAccess([npmGlobalPrefix, os.homedir()]), PNPM_GLOBAL)
}
const globalDirRoot = pnpmConfig['globalDir']
? pnpmConfig['globalDir']
: path.join(firstWithWriteAccess([npmGlobalPrefix, os.homedir()]), PNPM_GLOBAL)
pnpmConfig.dir = path.join(globalDirRoot, LAYOUT_VERSION.toString())
const npmConfigGlobalBinDir = npmConfig.get('global-bin-dir')
@@ -437,7 +443,6 @@ export default async (
pnpmConfig.noProxy = pnpmConfig['noproxy'] ?? getProcessEnv('no_proxy')
}
pnpmConfig.enablePnp = pnpmConfig['nodeLinker'] === 'pnp'
pnpmConfig.pnpmHomeDir = getDataDir(process)
if (opts.checkUnknownSetting) {
const settingKeys = Object.keys({