fix: Resolving issue with safe config

closes #160

.env.defaults

@@ -0,0 +1,2 @@
+TEST=nope
+TEST2=hidefault

package.json

@@ -42,7 +42,6 @@
     "webpack": "^1 || ^2 || ^3 || ^4"
   },
   "dependencies": {
-    "dotenv": "^5.0.1",
     "dotenv-defaults": "^1.0.2"
   },
   "devDependencies": {

src/index.js

@@ -62,7 +62,10 @@ class Dotenv {
       if (safe !== true) {
         file = safe
       }
-      blueprint = this.loadFile({ file, defaults, silent })
+      blueprint = this.loadFile({
+        file,
+        silent
+      })
     }
 
     Object.keys(blueprint).map(key => {
@@ -74,6 +77,11 @@ class Dotenv {
       }
     })
 
+    // add the leftovers
+    if (safe) {
+      Object.assign(vars, env)
+    }
+
     const formatData = Object.keys(vars).reduce((obj, key) => {
       const v = vars[key]
       const vKey = `process.env.${key}`

test/envs/.defaults

@@ -0,0 +1,2 @@
+TEST=nope
+TEST2=youcanseethis

test/main.spec.js

@@ -18,6 +18,7 @@ const envMissingOneExample = path.resolve(__dirname, './envs/.missingone.example
 const envSystemvars = path.resolve(__dirname, './envs/.systemvars')
 const envSystemvarsExample = path.resolve(__dirname, './envs/.systemvars.example')
 const envExpanded = path.resolve(__dirname, './envs/.expanded')
+const envDefaults = path.resolve(__dirname, './envs/.defaults')
 
 const buildExpectation = (obj) => Object.keys(obj).reduce((all, key) => {
   all[`process.env.${key}`] = JSON.stringify(obj[key])
@@ -28,6 +29,8 @@ const envDefJson = buildExpectation({ TEST: 'hi' })
 const envEmptyJson = buildExpectation({})
 const envSimpleJson = buildExpectation({ TEST: 'testing' })
 const envMissingOneJson = buildExpectation({ TEST: '', TEST2: 'Hello' })
+const envDefaultsJson = buildExpectation({ TEST: 'hi', TEST2: 'hidefault' })
+const envDefaultsJson2 = buildExpectation({ TEST: 'hi', TEST2: 'youcanseethis' })
 
 /*
 NODE_ENV=test
@@ -170,6 +173,16 @@ function runTests (Obj, name) {
       })
     })
 
+    describe('Defaults configuration', () => {
+      it('should support default configurations', () => {
+        envTest({ defaults: true }).should.deep.equal(envDefaultsJson)
+      })
+
+      it('should support string configurations', () => {
+        envTest({ defaults: envDefaults }).should.deep.equal(envDefaultsJson2)
+      })
+    })
+
     describe('System variables', () => {
       it('Should allow system env variables', () => {
         const test = envTest({ path: envSimple, systemvars: true })