Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: only set extraEnv for preferSymlinkedExecutables if it's not windows #5256

Merged
merged 1 commit into from
Aug 24, 2022
Merged

fix: only set extraEnv for preferSymlinkedExecutables if it's not windows #5256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/quiet-cameras-provide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@pnpm/config": patch
---

Only set extraEnv for preferSymlinkedExecutables if it's not windows.
2 changes: 2 additions & 0 deletions packages/config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"camelcase": "^6.3.0",
"can-write-to-dir": "^1.1.1",
"is-subdir": "^1.2.0",
"is-windows": "^1.0.2",
"normalize-registry-url": "2.0.0",
"path-absolute": "^1.0.1",
"path-name": "^1.0.0",
Expand All @@ -53,6 +54,7 @@
"devDependencies": {
"@pnpm/config": "workspace:*",
"@pnpm/prepare": "workspace:*",
"@types/is-windows": "^1.0.0",
"@types/ramda": "0.28.15",
"@types/which": "^2.0.1",
"symlink-dir": "^5.0.1"
Expand Down
3 changes: 2 additions & 1 deletion packages/config/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { safeReadProjectManifestOnly } from '@pnpm/read-project-manifest'
import { getCurrentBranch } from '@pnpm/git-utils'
import matcher from '@pnpm/matcher'
import camelcase from 'camelcase'
import isWindows from 'is-windows'
import normalizeRegistryUrl from 'normalize-registry-url'
import fromPairs from 'ramda/src/fromPairs'
import realpathMissing from 'realpath-missing'
Expand Down Expand Up @@ -404,7 +405,7 @@ export default async (
pnpmConfig.extraBinPaths = []
}

if (pnpmConfig.preferSymlinkedExecutables) {
if (pnpmConfig.preferSymlinkedExecutables && !isWindows()) {
const cwd = pnpmConfig.lockfileDir ?? pnpmConfig.dir

const virtualStoreDir = pnpmConfig.virtualStoreDir
Expand Down
6 changes: 6 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.