Minor npm npx raw-npm command cleanup

Author: jdalton

src/commands/npm.ts

@@ -10,8 +10,8 @@ const description = 'npm wrapper functionality'
 export const npm: CliSubcommand = {
   description,
   async run(argv, _importMeta, _ctx) {
-    process.exitCode = 1
     const wrapperPath = path.join(distPath, 'npm-cli.js')
+    process.exitCode = 1
     const spawnPromise = spawn(process.execPath, [wrapperPath, ...argv], {
       stdio: 'inherit'
     })

src/commands/npx.ts

@@ -11,9 +11,7 @@ export const npx: CliSubcommand = {
   description,
   async run(argv, _importMeta, _ctx) {
     const wrapperPath = path.join(distPath, 'npx-cli.js')
-
     process.exitCode = 1
-
     const spawnPromise = spawn(process.execPath, [wrapperPath, ...argv], {
       stdio: 'inherit'
     })

src/commands/raw-npm.ts

@@ -55,7 +55,7 @@ async function setupCommand(
     cli.showHelp()
     return
   }
-  const spawnPromise = spawn('npm', [argv.join(' ')], {
+  const spawnPromise = spawn('npm', <string[]>argv, {
     stdio: 'inherit'
   })
   spawnPromise.process.on('exit', (code, signal) => {

src/shadow/npm-cli.ts

@@ -14,13 +14,9 @@ const realDirname = path.dirname(realFilename)
 const npmPath = installLinks(path.join(realDirname, 'bin'), 'npm')
 const injectionPath = path.join(realDirname, 'npm-injection.js')
 
-process.exitCode = 1
-
-/* 
-  Adding the `--quiet` and `--no-progress` flags when the `proc-log` module 
-  is found to fix a UX issue when running the command with recent versions of npm
-  (input swallowed by the standard npm spinner) 
-*/
+// Adding the `--quiet` and `--no-progress` flags when the `proc-log` module
+// is found to fix a UX issue when running the command with recent versions of
+// npm (input swallowed by the standard npm spinner)
 let npmArgs: string[] = []
 if (process.argv.slice(2).includes('install')) {
   const npmEntrypoint = realpathSync(npmPath)
@@ -29,7 +25,6 @@ if (process.argv.slice(2).includes('install')) {
     process.exit(127)
   }
   const npmDepPath = path.join(npmRootPath, 'node_modules')
-
   let npmlog
   try {
     npmlog = require(path.join(npmDepPath, 'proc-log/lib/index.js')).log
@@ -39,16 +34,19 @@ if (process.argv.slice(2).includes('install')) {
   }
 }
 
-spawn(
+process.exitCode = 1
+const spawnPromise = spawn(
   process.execPath,
   ['--require', injectionPath, npmPath, ...process.argv.slice(2), ...npmArgs],
   {
     stdio: 'inherit'
   }
-).process.on('exit', (code, signal) => {
+)
+spawnPromise.process.on('exit', (code, signal) => {
   if (signal) {
     process.kill(process.pid, signal)
   } else if (code !== null) {
     process.exit(code)
   }
 })
+void spawnPromise

src/shadow/npx-cli.ts

@@ -14,7 +14,6 @@ const npxPath = installLinks(path.join(realDirname, 'bin'), 'npx')
 const injectionPath = path.join(realDirname, 'npm-injection.js')
 
 process.exitCode = 1
-
 const spawnPromise = spawn(
   process.execPath,
   ['--require', injectionPath, npxPath, ...process.argv.slice(2)],