@dotenvx/dotenvx 1.42.2 → 1.44.0

package/CHANGELOG.md

@@ -2,7 +2,23 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-[Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.42.2...main)
+[Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.44.0...main)
+
+## [1.44.0](https://github.com/dotenvx/dotenvx/compare/v1.43.0...v1.44.0)
+
+### Added
+
+* Add `armv7` support ([#593](https://github.com/dotenvx/dotenvx/pull/593))
+
+## [1.43.0](https://github.com/dotenvx/dotenvx/compare/v1.42.2...v1.43.0)
+
+### Removed
+
+* Remove `errorv, errornocolor, blank` from logger options ([#584](https://github.com/dotenvx/dotenvx/pull/584))
+
+### Changed
+
+* Replace instances of `console.error` with `logger.error` ([#584](https://github.com/dotenvx/dotenvx/pull/584))
 
 ## [1.42.2](https://github.com/dotenvx/dotenvx/compare/v1.42.1...v1.42.2)
 

package/package.json

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

package/src/cli/actions/decrypt.js

@@ -22,9 +22,9 @@ function decrypt () {
     for (const processedEnv of processedEnvs) {
       if (processedEnv.error) {
         errorCount += 1
-        console.error(processedEnv.error.message)
+        logger.error(processedEnv.error.message)
         if (processedEnv.error.help) {
-          console.error(processedEnv.error.help)
+          logger.error(processedEnv.error.help)
         }
       } else {
         console.log(processedEnv.envSrc)
@@ -51,12 +51,12 @@ function decrypt () {
           errorCount += 1
 
           if (processedEnv.error.code === 'MISSING_ENV_FILE') {
-            console.error(processedEnv.error.message)
+            logger.error(processedEnv.error.message)
             logger.help(`? add one with [echo "HELLO=World" > ${processedEnv.envFilepath}] and re-run [dotenvx decrypt]`)
           } else {
-            console.error(processedEnv.error.message)
+            logger.error(processedEnv.error.message)
             if (processedEnv.error.help) {
-              console.error(processedEnv.error.help)
+              logger.error(processedEnv.error.help)
             }
           }
         } else if (processedEnv.changed) {

package/src/cli/actions/ext/genexample.js

@@ -23,10 +23,10 @@ function genexample (directory) {
     if (addedKeys.length > 0) {
       logger.success(`updated .env.example (${addedKeys.length})`)
     } else {
-      logger.blank('no changes (.env.example)')
+      logger.info('no changes (.env.example)')
     }
   } catch (error) {
-    console.error(error.message)
+    logger.error(error.message)
     if (error.help) {
       logger.help(error.help)
     }

package/src/cli/actions/ext/scan.js

@@ -11,7 +11,7 @@ function scan () {
     // redirect stderr to stdout to capture and ignore it
     childProcess.execSync('gitleaks version', { stdio: ['ignore', 'pipe', 'ignore'] })
   } catch (error) {
-    console.error('gitleaks: command not found')
+    logger.error('gitleaks: command not found')
     logger.help('? install gitleaks:      [brew install gitleaks]')
     logger.help('? other install options: [https://github.com/gitleaks/gitleaks]')
     process.exit(1)
@@ -21,10 +21,10 @@ function scan () {
   let output = ''
   try {
     output = childProcess.execSync('gitleaks detect --no-banner --verbose 2>&1').toString() // gitleaks sends exit code 1 but puts data on stdout for failures, so we catch later and resurface the stdout
-    logger.blank(chomp(output))
+    logger.info(chomp(output))
   } catch (error) {
     if (error.stdout) {
-      console.error(chomp(error.stdout.toString()))
+      logger.error(chomp(error.stdout.toString()))
     }
 
     process.exit(1)

package/src/cli/actions/get.js

@@ -33,9 +33,9 @@ function get (key) {
         continue // ignore error
       }
 
-      console.error(error.message)
+      logger.error(error.message)
       if (error.help) {
-        console.error(error.help)
+        logger.error(error.help)
       }
     }
 
@@ -73,9 +73,9 @@ function get (key) {
       }
     }
   } catch (error) {
-    console.error(error.message)
+    logger.error(error.message)
     if (error.help) {
-      console.error(error.help)
+      logger.error(error.help)
     }
     process.exit(1)
   }

package/src/cli/actions/run.js

@@ -20,10 +20,10 @@ async function run () {
     const hasSeparator = process.argv.indexOf('--') !== -1
 
     if (hasSeparator) {
-      console.error('missing command after [dotenvx run --]. try [dotenvx run -- yourcommand]')
+      logger.error('missing command after [dotenvx run --]. try [dotenvx run -- yourcommand]')
     } else {
       const realExample = options.envFile[0] || '.env'
-      console.error(`ambiguous command due to missing '--' separator. try [dotenvx run -f ${realExample} -- yourcommand]`)
+      logger.error(`ambiguous command due to missing '--' separator. try [dotenvx run -f ${realExample} -- yourcommand]`)
     }
 
     process.exit(1)
@@ -71,15 +71,15 @@ async function run () {
 
         if (error.code === 'MISSING_ENV_FILE') {
           if (!options.convention) { // do not output error for conventions (too noisy)
-            console.error(error.message)
+            logger.error(error.message)
             if (error.help) {
-              console.error(`${error.help} and re-run [dotenvx run -- ${commandArgs.join(' ')}]`)
+              logger.error(`${error.help} and re-run [dotenvx run -- ${commandArgs.join(' ')}]`)
             }
           }
         } else {
-          console.error(error.message)
+          logger.error(error.message)
           if (error.help) {
-            console.error(error.help)
+            logger.error(error.help)
           }
         }
       }
@@ -111,9 +111,9 @@ async function run () {
 
     logger.successv(msg)
   } catch (error) {
-    console.error(error.message)
+    logger.error(error.message)
     if (error.help) {
-      console.error(error.help)
+      logger.error(error.help)
     }
     process.exit(1)
   }

package/src/lib/helpers/catchAndLog.js

@@ -1,7 +1,7 @@
 const { logger } = require('./../../shared/logger')
 
 function catchAndLog (error) {
-  console.error(error.message)
+  logger.error(error.message)
   if (error.help) {
     logger.help(error.help)
   }

package/src/lib/helpers/executeCommand.js

@@ -97,9 +97,9 @@ async function executeCommand (commandArgs, env) {
     // no color on these errors as they can be standard errors for things like jest exiting with exitCode 1 for a single failed test.
     if (!['SIGINT', 'SIGTERM'].includes(signalSent || error.signal)) {
       if (error.code === 'ENOENT') {
-        console.error(`Unknown command: ${error.command}`)
+        logger.error(`Unknown command: ${error.command}`)
       } else {
-        console.error(error.message)
+        logger.error(error.message)
       }
     }
 

package/src/lib/main.d.ts

@@ -139,17 +139,13 @@ export interface DotenvConfigOptions {
 
   logLevel?:
     | 'error'
-    | 'errorv'
-    | 'errornocolor'
     | 'warn'
     | 'success'
     | 'successv'
     | 'info'
     | 'help'
-    | 'http'
     | 'verbose'
-    | 'debug'
-    | 'blank';
+    | 'debug';
 }
 
 export interface DotenvConfigOutput {

package/src/lib/main.js

@@ -80,15 +80,15 @@ const config = function (options = {}) {
 
         if (error.code === 'MISSING_ENV_FILE') {
           if (!options.convention) { // do not output error for conventions (too noisy)
-            console.error(error.message)
+            logger.error(error.message)
             if (error.help) {
-              console.error(error.help)
+              logger.error(error.help)
             }
           }
         } else {
-          console.error(error.message)
+          logger.error(error.message)
           if (error.help) {
-            console.error(error.help)
+            logger.error(error.help)
           }
         }
       }
@@ -153,9 +153,9 @@ const parse = function (src, options = {}) {
 
   // display any errors
   for (const error of errors) {
-    console.error(error.message)
+    logger.error(error.message)
     if (error.help) {
-      console.error(error.help)
+      logger.error(error.help)
     }
   }
 
@@ -251,9 +251,9 @@ const get = function (key, options = {}) {
 
     if (options.strict) throw error // throw immediately if strict
 
-    console.error(error.message)
+    logger.error(error.message)
     if (error.help) {
-      console.error(error.help)
+      logger.error(error.help)
     }
   }
 

package/src/shared/logger.js

@@ -3,14 +3,11 @@ const { getColor, bold } = require('./colors')
 
 const levels = {
   error: 0,
-  errorv: 0,
-  errornocolor: 0,
   warn: 1,
   success: 2,
   successv: 2,
   info: 2,
   help: 2,
-  blank: 2,
   verbose: 4,
   debug: 5,
   silly: 6
@@ -26,7 +23,12 @@ const debug = getColor('plum')
 
 let currentLevel = levels.info // default log level
 
-function log (level, message) {
+function stderr (level, message) {
+  const formattedMessage = formatMessage(level, message)
+  console.error(formattedMessage)
+}
+
+function stdout (level, message) {
   if (levels[level] === undefined) {
     throw new Error(`MISSING_LOG_LEVEL: '${level}'. implement in logger.`)
   }
@@ -44,10 +46,6 @@ function formatMessage (level, message) {
     // errors
     case 'error':
       return error(formattedMessage)
-    case 'errorv':
-      return error(`[dotenvx@${packageJson.version}] ${formattedMessage}`)
-    case 'errornocolor':
-      return formattedMessage
     // warns
     case 'warn':
       return warn(formattedMessage)
@@ -68,9 +66,6 @@ function formatMessage (level, message) {
     // debug
     case 'debug':
       return debug(formattedMessage)
-    // blank
-    case 'blank': // custom
-      return formattedMessage
   }
 }
 
@@ -79,24 +74,20 @@ const logger = {
   level: 'info',
 
   // errors
-  error: (msg) => log('error', msg),
-  errorv: (msg) => log('errorv', msg),
-  errornocolor: (msg) => log('errornocolor', msg),
+  error: (msg) => stderr('error', msg),
   // warns
-  warn: (msg) => log('warn', msg),
+  warn: (msg) => stdout('warn', msg),
   // success
-  success: (msg) => log('success', msg),
-  successv: (msg) => log('successv', msg),
+  success: (msg) => stdout('success', msg),
+  successv: (msg) => stdout('successv', msg),
   // info
-  info: (msg) => log('info', msg),
+  info: (msg) => stdout('info', msg),
   // help
-  help: (msg) => log('help', msg),
+  help: (msg) => stdout('help', msg),
   // verbose
-  verbose: (msg) => log('verbose', msg),
+  verbose: (msg) => stdout('verbose', msg),
   // debug
-  debug: (msg) => log('debug', msg),
-  // blank
-  blank: (msg) => log('blank', msg),
+  debug: (msg) => stdout('debug', msg),
   setLevel: (level) => {
     if (levels[level] !== undefined) {
       currentLevel = levels[level]