Cleanup shadow bin args/flags

Author: jdalton

src/shadow/shadow-bin.ts

@@ -24,15 +24,20 @@ export default async function shadowBin(
       path.join(constants.distPath, 'npm-injection.js'),
       // Lazily access constants.shadowBinPath.
       await installLinks(constants.shadowBinPath, binName),
-      ...binArgs,
-      // Add the `--quiet` and `--no-progress` flags to fix input being swallowed
-      // by the spinner when running the command with recent versions of npm.
-      ...(binName === NPM &&
-      binArgs.includes('install') &&
-      !binArgs.includes('--no-progress') &&
-      !binArgs.includes('--quiet')
-        ? ['--no-progress', '--quiet']
-        : [])
+      ...(binName === NPM && binArgs.includes('install')
+        ? [
+            // Add the `--quiet` and `--no-progress` flags to fix input being swallowed
+            // by the spinner when running the command with recent versions of npm.
+            ...binArgs.filter(a => a !== '--progress' && a !== '--no-progress'),
+            '--no-progress',
+            ...(binArgs.includes('-q') ||
+            binArgs.includes('--quiet') ||
+            binArgs.includes('-s') ||
+            binArgs.includes('--silent')
+              ? []
+              : ['--quiet'])
+          ]
+        : binArgs)
     ],
     {
       signal: abortSignal,

src/utils/shadow-npm.ts

@@ -19,7 +19,20 @@ type ShadowNpmInstallOptions = SpawnOption & {
 }
 
 export function shadowNpmInstall(opts?: ShadowNpmInstallOptions) {
-  const { flags = [], ipc, ...spawnOptions } = { __proto__: null, ...opts }
+  const {
+    flags: flags_ = [],
+    ipc,
+    ...spawnOptions
+  } = { __proto__: null, ...opts }
+  const flags = flags_.filter(
+    f =>
+      f !== '--audit' &&
+      f !== '--fund' &&
+      f !== '--progress' &&
+      f !== '--no-audit' &&
+      f !== '--no-fund' &&
+      f !== '--no-progress'
+  )
   const useIpc = isObject(ipc)
   const useDebug = isDebug()
   const spawnPromise = spawn(
@@ -55,15 +68,7 @@ export function shadowNpmInstall(opts?: ShadowNpmInstallOptions) {
       )
         ? []
         : ['--silent']),
-      ...flags.filter(
-        f =>
-          f !== '--audit' &&
-          f !== '--fund' &&
-          f !== '--progress' &&
-          f !== '--no-audit' &&
-          f !== '--no-fund' &&
-          f !== '--no-progress'
-      )
+      ...flags
     ],
     {
       signal: abortSignal,