fix(core): call pnpm run without -- for pnpm v7
#10305
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
nartc
approved these changes
May 16, 2022
gioragutt
reviewed
May 16, 2022
| @@ -67,6 +67,7 @@ export function getPackageManagerCommand( | |||
| if (gte(pnpmVersion, '6.13.0')) { | |||
There was a problem hiding this comment.
Can you perhaps fix useExec to const useExec = gte(pnpmVersion, '6.13.0');?
You did it the right way and seeing the useExec above kinda hurts the eyes 😅
There was a problem hiding this comment.
Haha, agreed. Updated.
Starting in pnpm v7 all command line arguments after the script name are passed to a script's arguments when using `pnpm run <script>`, including `--`. This can cause problems when there are no command line arguments, because it will pass `--` without anything following, which some scripts can't handle. In order to preserve the old functionality, we check if the pnpm version is less than 7.0.0. If it is, we include `--` before the args, otherwise we don't. Closes nrwl#10111
Methuselah96
force-pushed
the
pnpm-v7-args
branch
from
52ce818
to
707a3b4
Compare
| run: (script: string, args: string) => | ||
| includeDoubleDashBeforeArgs | ||
| ? `pnpm run ${script} -- ${args}` | ||
| : `pnpm run ${script} ${args}`, |
There was a problem hiding this comment.
In case anyone is looking to patch v13, I created this patch for @nrwl/tao@13.8.0:
diff --git a/src/shared/package-manager.js b/src/shared/package-manager.js
index b74ffe01bc7cb161ac46462d723d8f521ec5a849..2ced85a576ad95bc2d18b363529d721d471408b2 100644
--- a/src/shared/package-manager.js
+++ b/src/shared/package-manager.js
@@ -39,17 +39,25 @@ function getPackageManagerCommand(packageManager = detectPackageManager()) {
}),
pnpm: () => {
const [major, minor] = getPackageManagerVersion('pnpm').split('.');
+ const majorVersion = +major
+
let useExec = false;
- if (+major >= 6 && +minor >= 13) {
+ if (majorVersion >= 6 && +minor >= 13) {
useExec = true;
}
+
+ const includeDoubleDashBeforeArgs = majorVersion < 7;
+
return {
install: 'pnpm install --no-frozen-lockfile',
add: 'pnpm add',
addDev: 'pnpm add -D',
rm: 'pnpm rm',
exec: useExec ? 'pnpm exec' : 'pnpx',
- run: (script, args) => `pnpm run ${script} -- ${args}`,
+ run: (script, args) =>
+ includeDoubleDashBeforeArgs
+ ? `pnpm run ${script} -- ${args}`
+ : `pnpm run ${script} ${args}`,
list: 'pnpm ls --depth 100',
};
},
|
This pull request has already been merged/closed. If you experience issues related to these changes, please open a new issue referencing this pull request. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Starting in pnpm v7 all command line arguments after the script name are passed to a script's arguments when using
pnpm run <script>, including--. This can cause problems when there are no command line arguments, because it will pass--without anything following, which some scripts can't handle. In order to preserve the old functionality, we check if the pnpm version is less than 7.0.0. If it is, we include--before the args, otherwise we don't.Closes #10111
Current Behavior
Appending
--topnpm run <script>when there are no arguments.Expected Behavior
Only include
--for pnpm <7.0.0.Related Issue(s)
Fixes #10111