Merge pull request #274 from tobias-trozowski/highest-priority-for-sy…

…stem-variables BREAKING CHANGE: Highest priority for system variables
mrsteele · Nov 25, 2020 · ce5958f · ce5958f
2 parents 61925bc + 45a48d8
commit ce5958f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/index.js b/src/index.js
@@ -68,7 +68,11 @@ class Dotenv {
 
     // add the leftovers
     if (safe) {
-      Object.assign(vars, env)
+      Object.keys(env).forEach((key) => {
+        if (!Object.prototype.hasOwnProperty.call(vars, key)) {
+          vars[key] = env[key]
+        }
+      })
     }
 
     return vars

diff --git a/test/index.test.js b/test/index.test.js
@@ -217,6 +217,14 @@ function runTests (Obj, name) {
       test('should not allow local variables to override systemvars', () => {
         expect(envTest({ path: envSystemvars, systemvars: true })['process.env.PATH2'] !== '""').toEqual(true)
       })
+
+      test('Should give the highest priority for the system variables', () => {
+        process.env.TEST = 'production'
+        const test = envTest({ safe: true, systemvars: true, defaults: true })
+        expect(test['process.env.TEST']).toEqual('"production"')
+        expect(test['process.env.TEST2']).toEqual('"hidefault"')
+        delete process.env.TEST
+      })
     })
 
     describe('Empty variables', () => {