@dotenvx/dotenvx 0.8.3 → 0.9.0

package/README.md

@@ -347,10 +347,20 @@ More examples
 
 * <details><summary>Heroku</summary><br>
 
+  > Add the buildpack, installing the `dotenvx` binary to your heroku deployment.
+
   ```sh
-  coming soon
+  heroku buildpacks:add https://github.com/dotenvx/heroku-buildpack-dotenvx
   ```
 
+  > Use it in your Procfile.
+
+  ```sh
+  web: dotenvx run -- node index.js
+  ```
+
+  <sub><a href="https://github.com/dotenvx/heroku-buildpack-dotenvx">buildpack docs</a></sub>
+
   </details>
 
 * <details><summary>Laravel Forge</summary><br>

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.8.3",
+  "version": "0.9.0",
   "name": "@dotenvx/dotenvx",
   "description": "a better dotenv–from the creator of `dotenv`",
   "author": "@motdotla",

package/src/cli/actions/hub/login.js

@@ -1,5 +1,5 @@
 const open = require('open')
-const axios = require('./../../../../node_modules/axios/dist/node/axios.cjs')
+const axios = require('./../../../shared/axios')
 const clipboardy = require('clipboardy')
 const { confirm } = require('@inquirer/prompts')
 

package/src/cli/actions/hub/push.js

@@ -1,6 +1,6 @@
 const fs = require('fs')
 const { execSync } = require('child_process')
-const axios = require('./../../../../node_modules/axios/dist/node/axios.cjs')
+const axios = require('./../../../shared/axios')
 
 const store = require('./../../../shared/store')
 const logger = require('./../../../shared/logger')

package/src/cli/actions/run.js

@@ -6,6 +6,9 @@ const main = require('./../../lib/main')
 const ENCODING = 'utf8'
 
 async function run () {
+  const commandArgs = this.args
+  logger.debug(`process command [${commandArgs.join(' ')}]`)
+
   const options = this.opts()
   logger.debug(`options: ${JSON.stringify(options)}`)
 
@@ -81,7 +84,19 @@ async function run () {
         readableFilepaths.add(envFilepath)
         result.injected.forEach(key => injected.add(key))
       } catch (e) {
-        logger.warn(e)
+        switch (e.code) {
+          // missing .env
+          case 'ENOENT':
+            logger.warnv(`missing .env file (${filepath})`)
+            logger.help(`? in development: add one with [echo "HELLO=World" > .env] and re-run [dotenvx run -- ${commandArgs.join(' ')}]`)
+            logger.help('? for production: set [DOTENV_KEY] on your server and re-deploy')
+            break
+
+          // unhandled error
+          default:
+            logger.warn(e)
+            break
+        }
       }
     }
 
@@ -99,9 +114,8 @@ async function run () {
     logger.error('  or try:   [dotenvx run -- npm run dev]')
     process.exit(1)
   } else {
-    const subCommand = process.argv.slice(commandIndex + 1)
-
-    await helpers.executeCommand(subCommand, process.env)
+    // const commandArgs = process.argv.slice(commandIndex + 1)
+    await helpers.executeCommand(commandArgs, process.env)
   }
 }
 

package/src/cli/dotenvx.js

@@ -56,7 +56,7 @@ program
 
 // dotenvx run -- node index.js
 program.command('run')
-  .description('inject env at runtime [dotenvx run -- your-command-here]')
+  .description('inject env at runtime [dotenvx run -- yourcommand]')
   .addHelpText('after', examples.run)
   .option('-f, --env-file <paths...>', 'path(s) to your env file(s)', '.env')
   .option('-o, --overload', 'override existing env variables')

package/src/cli/helpers.js

@@ -23,26 +23,26 @@ const resolvePath = function (filepath) {
   return path.resolve(process.cwd(), filepath)
 }
 
-const executeCommand = async function (subCommand, env) {
+const executeCommand = async function (commandArgs, env) {
   const signals = [
     'SIGHUP', 'SIGQUIT', 'SIGILL', 'SIGTRAP', 'SIGABRT',
     'SIGBUS', 'SIGFPE', 'SIGUSR1', 'SIGSEGV', 'SIGUSR2', 'SIGTERM'
   ]
 
-  logger.debug(`executing subcommand ${subCommand}`)
+  logger.debug(`executing process command [${commandArgs.join(' ')}]`)
 
   // handler for SIGINT
-  let subprocess
+  let commandProcess
   const sigintHandler = () => {
     logger.debug('received SIGINT')
-    logger.debug('checking subprocess')
-    logger.debug(subprocess)
+    logger.debug('checking command process')
+    logger.debug(commandProcess)
 
-    if (subprocess) {
-      logger.debug('sending SIGINT to subprocess')
-      subprocess.kill('SIGINT') // Send SIGINT to the subprocess
+    if (commandProcess) {
+      logger.debug('sending SIGINT to command process')
+      commandProcess.kill('SIGINT') // Send SIGINT to the command process
     } else {
-      logger.debug('no subprocess to send SIGINT to')
+      logger.debug('no command process to send SIGINT to')
     }
   }
 
@@ -51,7 +51,7 @@ const executeCommand = async function (subCommand, env) {
   }
 
   try {
-    subprocess = execa(subCommand[0], subCommand.slice(1), {
+    commandProcess = execa(commandArgs[0], commandArgs.slice(1), {
       stdio: 'inherit',
       env: { ...process.env, ...env }
     })
@@ -62,8 +62,8 @@ const executeCommand = async function (subCommand, env) {
       process.on(signal, () => handleOtherSignal(signal))
     })
 
-    // Wait for the subprocess to finish
-    const { exitCode } = await subprocess
+    // Wait for the command process to finish
+    const { exitCode } = await commandProcess
 
     if (exitCode !== 0) {
       logger.debug(`received exitCode ${exitCode}`)
@@ -72,15 +72,15 @@ const executeCommand = async function (subCommand, env) {
   } catch (error) {
     if (error.signal !== 'SIGINT') {
       logger.error(error.message)
-      logger.error(`command [${subCommand.join(' ')}] failed`)
+      logger.error(`command [${commandArgs.join(' ')}] failed`)
       logger.error('')
-      logger.error(`  try without dotenvx: [${subCommand.join(' ')}]`)
+      logger.error(`  try without dotenvx: [${commandArgs.join(' ')}]`)
       logger.error('')
       logger.error('if that succeeds, then dotenvx is the culprit. report issue:')
       logger.error(`<${REPORT_ISSUE_LINK}>`)
     }
 
-    // Exit with the error code from the subprocess, or 1 if unavailable
+    // Exit with the error code from the command process, or 1 if unavailable
     process.exit(error.exitCode || 1)
   } finally {
     // Clean up: Remove the SIGINT handler

package/src/cli/ignores.js

@@ -1,6 +1,6 @@
 const fs = require('fs')
 
-const FORMATS = ['.env*', '!.env.vault', '.flaskenv*']
+const FORMATS = ['.env*', '!.env.vault']
 
 class Generic {
   constructor (filename, touchFile = false) {

package/src/shared/axios.js

@@ -0,0 +1,7 @@
+try {
+  const axios = require('./../../node_modules/axios/dist/node/axios.cjs')
+  module.exports = axios
+} catch (error) {
+  const axios = require('axios')
+  module.exports = axios
+}

package/src/shared/logger.js

@@ -11,6 +11,7 @@ const packageJson = require('./packageJson')
 const levels = {
   error: 0,
   warn: 1,
+  warnv: 1,
   success: 2,
   successv: 2,
   info: 2,
@@ -41,6 +42,8 @@ const dotenvxFormat = printf(({ level, message, label, timestamp }) => {
       return error(formattedMessage)
     case 'warn':
       return warn(formattedMessage)
+    case 'warnv':
+      return warn(`[dotenvx@${packageJson.version}] ${formattedMessage}`)
     case 'success':
       return success(formattedMessage)
     case 'successv': // success with 'version'