@dotenvx/dotenvx 0.6.13 → 0.7.2

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.6.13",
+  "version": "0.7.2",
   "name": "@dotenvx/dotenvx",
   "description": "a better dotenv–from the creator of `dotenv`",
   "author": "@motdotla",
@@ -26,6 +26,7 @@
   "dependencies": {
     "commander": "^11.1.0",
     "dotenv": "^16.3.1",
+    "execa": "^5.1.1",
     "winston": "^3.11.0",
     "xxhashjs": "^0.2.2"
   },

package/src/cli/dotenvx.js

@@ -58,7 +58,7 @@ program.command('run')
   .addHelpText('after', examples.run)
   .option('-f, --env-file <paths...>', 'path(s) to your env file(s)', '.env')
   .option('-o, --overload', 'override existing env variables')
-  .action(function () {
+  .action(async function () {
     const options = this.opts()
     logger.debug('configuring options')
     logger.debug(options)
@@ -167,7 +167,7 @@ program.command('run')
     } else {
       const subCommand = process.argv.slice(commandIndex + 1)
 
-      helpers.executeCommand(subCommand, process.env)
+      await helpers.executeCommand(subCommand, process.env)
     }
   })
 

package/src/cli/helpers.js

@@ -1,7 +1,7 @@
 const fs = require('fs')
 const path = require('path')
+const execa = require('execa')
 const crypto = require('crypto')
-const { spawn } = require('child_process')
 const xxhash = require('xxhashjs')
 
 const XXHASH_SEED = 0xABCD
@@ -18,16 +18,52 @@ const resolvePath = function (filepath) {
   return path.resolve(process.cwd(), filepath)
 }
 
-const executeCommand = function (subCommand, env) {
-  const subprocess = spawn(subCommand[0], subCommand.slice(1), {
-    stdio: 'inherit',
-    shell: true,
-    env: { ...process.env, ...env }
-  })
+const executeCommand = async function (subCommand, env) {
+  const signals = [
+    'SIGHUP', 'SIGQUIT', 'SIGILL', 'SIGTRAP', 'SIGABRT',
+    'SIGBUS', 'SIGFPE', 'SIGUSR1', 'SIGSEGV', 'SIGUSR2', 'SIGTERM'
+  ]
 
-  subprocess.on('close', (code) => {
-    if (code > 0) {
-      logger.error(`command [${subCommand.join(' ')}] failed (code: ${code})`)
+  logger.debug(`executing subcommand ${subCommand}`)
+
+  // handler for SIGINT
+  let subprocess
+  const sigintHandler = () => {
+    logger.debug('received SIGINT')
+
+    if (subprocess) {
+      logger.debug('sending SIGINT to subprocess')
+      subprocess.kill('SIGINT') // Send SIGINT to the subprocess
+    }
+  }
+
+  const handleOtherSignal = (signal) => {
+    logger.debug(`received ${signal}`)
+  }
+
+  try {
+    const subprocess = execa(subCommand[0], subCommand.slice(1), {
+      stdio: 'inherit',
+      env: { ...process.env, ...env }
+    })
+
+    process.on('SIGINT', sigintHandler)
+
+    signals.forEach(signal => {
+      process.on(signal, () => handleOtherSignal(signal))
+    })
+
+    // Wait for the subprocess to finish
+    const { exitCode } = await subprocess
+
+    if (exitCode !== 0) {
+      logger.debug(`received exitCode ${exitCode}`)
+      throw new Error(`Command failed with exit code ${exitCode}`)
+    }
+  } catch (error) {
+    if (error.signal !== 'SIGINT') {
+      logger.error(error.message)
+      logger.error(`command [${subCommand.join(' ')}] failed`)
       logger.error('')
       logger.error(`  try without dotenvx: [${subCommand.join(' ')}]`)
       logger.error('')
@@ -35,20 +71,12 @@ const executeCommand = function (subCommand, env) {
       logger.error(`<${REPORT_ISSUE_LINK}>`)
     }
 
-    process.exit(code)
-  })
-
-  subprocess.on('error', (err) => {
-    logger.error(err)
-    logger.error(`command [${subCommand.join(' ')}] failed`)
-    logger.error('')
-    logger.error(`  try without dotenvx: [${subCommand.join(' ')}]`)
-    logger.error('')
-    logger.error('if that succeeds, then dotenvx is the culprit. report issue:')
-    logger.error(`<${REPORT_ISSUE_LINK}>`)
-
-    process.exit(1)
-  })
+    // Exit with the error code from the subprocess, or 1 if unavailable
+    process.exit(error.exitCode || 1)
+  } finally {
+    // Clean up: Remove the SIGINT handler
+    process.removeListener('SIGINT', sigintHandler)
+  }
 }
 
 const pluralize = function (word, count) {