From 7b7fc89dd14847e61faebde85170c6671d6f0884 Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Mon, 16 May 2022 10:36:08 -0400
Subject: [PATCH] fix(core): call pnpm run without -- for pnpm v7 (#10305)

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
---
 packages/nx/src/utils/package-manager.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/nx/src/utils/package-manager.ts b/packages/nx/src/utils/package-manager.ts
index c484b73dbb7b8..c5e056dce7f3c 100644
--- a/packages/nx/src/utils/package-manager.ts
+++ b/packages/nx/src/utils/package-manager.ts
@@ -6,7 +6,7 @@ import { dirSync } from 'tmp';
 import { promisify } from 'util';
 import { readJsonFile, writeJsonFile } from './fileutils';
 import { PackageJson } from './package-json';
-import { gte } from 'semver';
+import { gte, lt } from 'semver';
 
 const execAsync = promisify(exec);
 
@@ -63,10 +63,8 @@ export function getPackageManagerCommand(
     }),
     pnpm: () => {
       const pnpmVersion = getPackageManagerVersion('pnpm');
-      let useExec = false;
-      if (gte(pnpmVersion, '6.13.0')) {
-        useExec = true;
-      }
+      const useExec = gte(pnpmVersion, '6.13.0');
+      const includeDoubleDashBeforeArgs = lt(pnpmVersion, '7.0.0');
       return {
         install: 'pnpm install --no-frozen-lockfile', // explicitly disable in case of CI
         ciInstall: 'pnpm install --frozen-lockfile',
@@ -75,7 +73,10 @@ export function getPackageManagerCommand(
         addGlobal: 'pnpm add -g',
         rm: 'pnpm rm',
         exec: useExec ? 'pnpm exec' : 'pnpx',
-        run: (script: string, args: string) => `pnpm run ${script} -- ${args}`,
+        run: (script: string, args: string) =>
+          includeDoubleDashBeforeArgs
+            ? `pnpm run ${script} -- ${args}`
+            : `pnpm run ${script} ${args}`,
         list: 'pnpm ls --depth 100',
       };
     },