feat(Variables): Expand environment variables

serverless · Jun 16, 2021 · f70f8f8 · f70f8f8
1 parent 4ca51cc
commit f70f8f8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/cli/load-dotenv.js b/lib/cli/load-dotenv.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const dotenv = require('dotenv');
+const dotenvExpand = require('dotenv-expand');
 const path = require('path');
 const ServerlessError = require('../serverless-error');
 
@@ -11,19 +12,25 @@ const throwDotenvError = (error, filePath) => {
   throw new ServerlessError(errorMessage, 'DOTENV_LOAD_ERROR');
 };
 
+const loadDotenvFrom = (envFilePath) => {
+  const config = dotenv.config({ path: envFilePath });
+  return dotenvExpand(config);
+};
+
 module.exports = (stage) => {
   const defaultEnvFilePath = path.join(process.cwd(), '.env');
   const stageEnvFilePath = path.join(process.cwd(), `.env.${stage}`);
 
-  const { error: stageEnvResultError } = dotenv.config({ path: stageEnvFilePath });
+  const { error: stageEnvResultError } = loadDotenvFrom(stageEnvFilePath);
 
   if (!stageEnvResultError) return;
 
   if (!isMissingFileError(stageEnvResultError)) {
     throwDotenvError(stageEnvResultError, stageEnvFilePath);
   }
 
-  const { error: defaultEnvResultError } = dotenv.config({ path: defaultEnvFilePath });
+  const { error: defaultEnvResultError } = loadDotenvFrom(defaultEnvFilePath);
+
   if (defaultEnvResultError && !isMissingFileError(defaultEnvResultError)) {
     throwDotenvError(defaultEnvResultError, defaultEnvFilePath);
   }

diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
     "dayjs": "^1.10.5",
     "decompress": "^4.2.1",
     "dotenv": "^10.0.0",
+    "dotenv-expand": "^5.1.0",
     "essentials": "^1.1.1",
     "fastest-levenshtein": "^1.0.12",
     "filesize": "^6.3.0",