From 78996affefc5ec5627d8797f44969c2bceb4c3ac Mon Sep 17 00:00:00 2001
From: Scott Motte <mot@mot.la>
Date: Mon, 17 Jan 2022 12:39:49 -0800
Subject: [PATCH 1/2] Add override cli and env options

---
 README.md                 | 4 ++--
 lib/cli-options.js        | 2 +-
 lib/env-options.js        | 4 ++++
 tests/test-cli-options.js | 7 ++++++-
 tests/test-env-options.js | 8 +++++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 793321d2..be1b028e 100644
--- a/README.md
+++ b/README.md
@@ -203,7 +203,7 @@ $ node -r dotenv/config your_script.js
 The configuration options below are supported as command line arguments in the format `dotenv_config_<option>=value`
 
 ```bash
-$ node -r dotenv/config your_script.js dotenv_config_path=/custom/path/to/.env
+$ node -r dotenv/config your_script.js dotenv_config_path=/custom/path/to/.env dotenv_config_debug=true
 ```
 
 Additionally, you can use environment variables to set configuration options. Command line arguments will precede these.
@@ -213,7 +213,7 @@ $ DOTENV_CONFIG_<OPTION>=value node -r dotenv/config your_script.js
 ```
 
 ```bash
-$ DOTENV_CONFIG_ENCODING=latin1 node -r dotenv/config your_script.js dotenv_config_path=/custom/path/to/.env
+$ DOTENV_CONFIG_ENCODING=latin1 DOTENV_CONFIG_DEBUG=true node -r dotenv/config your_script.js dotenv_config_path=/custom/path/to/.env
 ```
 
 ## FAQ
diff --git a/lib/cli-options.js b/lib/cli-options.js
index a41473df..b5012a89 100644
--- a/lib/cli-options.js
+++ b/lib/cli-options.js
@@ -1,4 +1,4 @@
-const re = /^dotenv_config_(encoding|path|debug)=(.+)$/
+const re = /^dotenv_config_(encoding|path|debug|override)=(.+)$/
 
 module.exports = function optionMatcher (args) {
   return args.reduce(function (acc, cur) {
diff --git a/lib/env-options.js b/lib/env-options.js
index e42bdf2a..64e2db7b 100644
--- a/lib/env-options.js
+++ b/lib/env-options.js
@@ -13,4 +13,8 @@ if (process.env.DOTENV_CONFIG_DEBUG != null) {
   options.debug = process.env.DOTENV_CONFIG_DEBUG
 }
 
+if (process.env.DOTENV_CONFIG_OVERRIDE != null) {
+  options.override = process.env.DOTENV_CONFIG_OVERRIDE
+}
+
 module.exports = options
diff --git a/tests/test-cli-options.js b/tests/test-cli-options.js
index 9e000a8f..92a6ac60 100644
--- a/tests/test-cli-options.js
+++ b/tests/test-cli-options.js
@@ -2,7 +2,7 @@ const t = require('tap')
 
 const options = require('../lib/cli-options')
 
-t.plan(5)
+t.plan(6)
 
 // matches encoding option
 t.same(options(['node', '-e', "'console.log(testing)'", 'dotenv_config_encoding=utf8']), {
@@ -19,6 +19,11 @@ t.same(options(['node', '-e', "'console.log(testing)'", 'dotenv_config_debug=tru
   debug: 'true'
 })
 
+// matches override option
+t.same(options(['node', '-e', "'console.log(testing)'", 'dotenv_config_override=true']), {
+  override: 'true'
+})
+
 // ignores empty values
 t.same(options(['node', '-e', "'console.log(testing)'", 'dotenv_config_path=']), {})
 
diff --git a/tests/test-env-options.js b/tests/test-env-options.js
index 8932b5dd..56bbbc48 100644
--- a/tests/test-env-options.js
+++ b/tests/test-env-options.js
@@ -8,6 +8,7 @@ require('../lib/env-options')
 const e = process.env.DOTENV_CONFIG_ENCODING
 const p = process.env.DOTENV_CONFIG_PATH
 const d = process.env.DOTENV_CONFIG_DEBUG
+const o = process.env.DOTENV_CONFIG_OVERRIDE
 
 // get fresh object for each test
 function options () {
@@ -24,12 +25,13 @@ function testOption (envVar, tmpVal, expect) {
   delete process.env[envVar]
 }
 
-t.plan(4)
+t.plan(5)
 
 // returns empty object when no options set in process.env
 delete process.env.DOTENV_CONFIG_ENCODING
 delete process.env.DOTENV_CONFIG_PATH
 delete process.env.DOTENV_CONFIG_DEBUG
+delete process.env.DOTENV_CONFIG_OVERRIDE
 
 t.same(options(), {})
 
@@ -42,7 +44,11 @@ testOption('DOTENV_CONFIG_PATH', '~/.env.test', { path: '~/.env.test' })
 // sets debug option
 testOption('DOTENV_CONFIG_DEBUG', 'true', { debug: 'true' })
 
+// sets override option
+testOption('DOTENV_CONFIG_OVERRIDE', 'true', { override: 'true' })
+
 // restore existing env
 process.env.DOTENV_CONFIG_ENCODING = e
 process.env.DOTENV_CONFIG_PATH = p
 process.env.DOTENV_CONFIG_DEBUG = d
+process.env.DOTENV_CONFIG_OVERRIDE = o

From aeae434e53836d2e46feed2ec13c3b7dddf42086 Mon Sep 17 00:00:00 2001
From: Scott Motte <mot@mot.la>
Date: Mon, 17 Jan 2022 12:42:12 -0800
Subject: [PATCH 2/2] Version 14.2.0

---
 CHANGELOG.md      | 7 +++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63ee414c..d1b351da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ All notable changes to this project will be documented in this file. See [standa
 
 (place unreleased comments here)
 
+## [14.2.0](https://github.com/motdotla/dotenv/compare/v14.1.1...v14.2.0) (2022-01-17)
+
+### Added
+
+- Add `dotenv_config_override` cli option
+- Add `DOTENV_CONFIG_OVERRIDE` command line env option
+
 ## [14.1.1](https://github.com/motdotla/dotenv/compare/v14.1.0...v14.1.1) (2022-01-17)
 
 ### Added
diff --git a/package-lock.json b/package-lock.json
index e7649c3a..c4142331 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
   "name": "dotenv",
-  "version": "14.1.1",
+  "version": "14.2.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "14.1.1",
+      "version": "14.2.0",
       "license": "BSD-2-Clause",
       "devDependencies": {
         "@types/node": "^17.0.9",
diff --git a/package.json b/package.json
index d6fcbffa..f32e1ea3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dotenv",
-  "version": "14.1.1",
+  "version": "14.2.0",
   "description": "Loads environment variables from .env file",
   "main": "lib/main.js",
   "types": "lib/main.d.ts",