add dotenv-expand support

brysgo · Dec 15, 2017 · a7c2067 · a7c2067
1 parent 5272858
commit a7c2067
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/.env b/.env
@@ -1 +1,2 @@
-EXAMPLE_ENV_VAR="simple example"
+EXAMPLE_ENV_VAR="simple example"
+EXAMPLE_ENV_VAR_EXPAND=$EXAMPLE_ENV_VAR-expand
diff --git a/package.json b/package.json
@@ -28,6 +28,7 @@
     "babel-eslint": "^8.0.1",
     "babel-preset-es2015": "^6.1.18",
     "babel-register": "^6.2.0",
-    "mocha": "^4.0.1"
+    "mocha": "^4.0.1",
+    "dotenv-expand": "^4.0.1"    
   }
 }
diff --git a/src/index.js b/src/index.js
@@ -12,6 +12,10 @@ module.exports = function (options) {
         if (path.get("object").matchesPattern("process.env")) {
           if (!dotenv) {
             dotenv = require('dotenv').config(state.opts);
+            var dotenvExpand;
+            try { dotenvExpand = require('dotenv-expand'); } catch(e) {}
+            if (dotenvExpand)
+              dotenvExpand(dotenv);
           }
           var key = path.toComputedKey();
           if (t.isStringLiteral(key)) {

diff --git a/test/fixtures/code-simple-env-variable/actual.js b/test/fixtures/code-simple-env-variable/actual.js
@@ -6,6 +6,7 @@
 // A base class is defined using the new reserved 'class' keyword
 
 const EXAMPLE_ENV_VAR = process.env.EXAMPLE_ENV_VAR;
+const EXAMPLE_ENV_VAR_EXPAND = process.env.EXAMPLE_ENV_VAR_EXPAND;
 
 class Polygon {
   // ..and an (optional) custom class constructor. If one is

diff --git a/test/fixtures/code-simple-env-variable/expected.js b/test/fixtures/code-simple-env-variable/expected.js
@@ -6,6 +6,7 @@
 // A base class is defined using the new reserved 'class' keyword
 
 const EXAMPLE_ENV_VAR = process && process.env && process.env.EXAMPLE_ENV_VAR || "simple example";
+const EXAMPLE_ENV_VAR_EXPAND = process && process.env && process.env.EXAMPLE_ENV_VAR_EXPAND || "simple example-expand";
 
 class Polygon {
   // ..and an (optional) custom class constructor. If one is