From 3e682067de174b499efcb3e06cd9a9e2dae317a2 Mon Sep 17 00:00:00 2001
From: Brandon Cheng <gluxon@users.noreply.github.com>
Date: Mon, 31 Jan 2022 08:11:14 -0500
Subject: [PATCH] fix: revert backwards compatible handling of -- for run
 (#4291)

---
 .changeset/odd-kangaroos-care.md              |  2 +-
 .../plugin-commands-script-runners/src/run.ts |  5 ----
 packages/pnpm/test/run.ts                     | 26 +++----------------
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/.changeset/odd-kangaroos-care.md b/.changeset/odd-kangaroos-care.md
index 4247e2c4c2..13b4b6954b 100644
--- a/.changeset/odd-kangaroos-care.md
+++ b/.changeset/odd-kangaroos-care.md
@@ -4,4 +4,4 @@
 "pnpm": major
 ---
 
-When using `pnpm run <script>`, all command line arguments after the script name are now passed to the script's argv. Previously flagged arguments (e.g. `--silent`) were intepreted as pnpm arguments unless `--` came before it.
+When using `pnpm run <script>`, all command line arguments after the script name are now passed to the script's argv, even `--`. For example, `pnpm run echo --hello -- world` will now pass `--hello -- world` to the `echo` script's argv. Previously flagged arguments (e.g. `--silent`) were intepreted as pnpm arguments unless `--` came before it.
diff --git a/packages/plugin-commands-script-runners/src/run.ts b/packages/plugin-commands-script-runners/src/run.ts
index 19eac279f3..47457f0eb9 100644
--- a/packages/plugin-commands-script-runners/src/run.ts
+++ b/packages/plugin-commands-script-runners/src/run.ts
@@ -134,11 +134,6 @@ export async function handler (
 ) {
   let dir: string
   const [scriptName, ...passedThruArgs] = params
-  // For backward compatibility
-  const firstDoubleDash = passedThruArgs.findIndex((arg) => arg === '--')
-  if (firstDoubleDash !== -1) {
-    passedThruArgs.splice(firstDoubleDash, 1)
-  }
   if (opts.recursive) {
     if (scriptName || Object.keys(opts.selectedProjectsGraph).length > 1) {
       return runRecursive(params, opts)
diff --git a/packages/pnpm/test/run.ts b/packages/pnpm/test/run.ts
index 3a26f4e5c4..587db5eb2b 100644
--- a/packages/pnpm/test/run.ts
+++ b/packages/pnpm/test/run.ts
@@ -47,8 +47,10 @@ test('run: pass the args to the command that is specfied in the build script', a
   ])
 })
 
-// Before pnpm v7, `--` was required to pass flags to a build script.
-test('run: handle -- in a backwards compatible manner', async () => {
+// Before pnpm v7, `--` was required to pass flags to a build script. Now all
+// arguments after the script name should be passed to the build script, even
+// `--`.
+test('run: pass all arguments after script name to the build script, even --', async () => {
   prepare({
     name: 'project',
     scripts: {
@@ -62,26 +64,6 @@ test('run: handle -- in a backwards compatible manner', async () => {
 
   await execPnpm(['run', 'foo', 'arg', '--', '--flag=true'])
 
-  const { default: args } = await import(path.resolve('args.json'))
-  expect(args).toStrictEqual([
-    ['arg', '--flag=true'],
-  ])
-})
-
-test('run: pass -- to the build script if specified twice', async () => {
-  prepare({
-    name: 'project',
-    scripts: {
-      foo: 'node recordArgs',
-      postfoo: 'node recordArgs',
-      prefoo: 'node recordArgs',
-    },
-  })
-  await fs.writeFile('args.json', '[]', 'utf8')
-  await fs.writeFile('recordArgs.js', RECORD_ARGS_FILE, 'utf8')
-
-  await execPnpm(['run', 'foo', '--', 'arg', '--', '--flag=true'])
-
   const { default: args } = await import(path.resolve('args.json'))
   expect(args).toStrictEqual([
     ['arg', '--', '--flag=true'],