Add tests for dotenv-expand behavior (#12140)

vercel · Apr 23, 2020 · 0a3b64d · 0a3b64d
1 parent 29f86d9
commit 0a3b64d
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 38 deletions.
diff --git a/packages/next/lib/load-env-config.ts b/packages/next/lib/load-env-config.ts
@@ -17,7 +17,11 @@ const packageJsonHasDep = (packageJsonPath: string, dep: string): boolean => {
   return allPackages.some(pkg => pkg === dep)
 }
 
+let combinedEnv: Env | undefined = undefined
+
 export function loadEnvConfig(dir: string, dev?: boolean): Env | false {
+  if (combinedEnv) return combinedEnv
+
   const packageJson = findUp.sync('package.json', { cwd: dir })
 
   // only do new env loading if dotenv isn't installed since we
@@ -61,9 +65,9 @@ export function loadEnvConfig(dir: string, dev?: boolean): Env | false {
     '.env',
   ].filter(Boolean) as string[]
 
-  const combinedEnv: Env = {
+  combinedEnv = {
     ...(process.env as any),
-  }
+  } as Env
 
   for (const envFile of dotenvFiles) {
     // only load .env if the user provided has an env config file

diff --git a/test/integration/env-config/app/.env b/test/integration/env-config/app/.env
@@ -7,4 +7,7 @@ ENV_FILE_PRODUCTION_OVERRIDEOVERRIDE_TEST=env
 ENV_FILE_PRODUCTION_LOCAL_OVERRIDEOVERRIDE_TEST=env
 ENV_FILE_TEST_OVERRIDE_TEST=env
 ENV_FILE_TEST_LOCAL_OVERRIDEOVERRIDE_TEST=env
-NEXT_PUBLIC_TEST_DEST=another
+NEXT_PUBLIC_TEST_DEST=another
+ENV_FILE_EXPANDED=$ENV_FILE_KEY
+ENV_FILE_EXPANDED_CONCAT=hello-${ENV_FILE_KEY}
+ENV_FILE_EXPANDED_ESCAPED=\$ENV_FILE_KEY
diff --git a/test/integration/env-config/app/pages/api/all.js b/test/integration/env-config/app/pages/api/all.js
@@ -15,6 +15,9 @@ const variables = [
   'LOCAL_TEST_ENV_FILE_KEY',
   'ENV_FILE_TEST_OVERRIDE_TEST',
   'ENV_FILE_TEST_LOCAL_OVERRIDEOVERRIDE_TEST',
+  'ENV_FILE_EXPANDED',
+  'ENV_FILE_EXPANDED_CONCAT',
+  'ENV_FILE_EXPANDED_ESCAPED',
 ]
 
 const items = {}

diff --git a/test/integration/env-config/app/pages/index.js b/test/integration/env-config/app/pages/index.js
@@ -15,6 +15,9 @@ const variables = [
   'LOCAL_TEST_ENV_FILE_KEY',
   'ENV_FILE_TEST_OVERRIDE_TEST',
   'ENV_FILE_TEST_LOCAL_OVERRIDEOVERRIDE_TEST',
+  'ENV_FILE_EXPANDED',
+  'ENV_FILE_EXPANDED_CONCAT',
+  'ENV_FILE_EXPANDED_ESCAPED',
 ]
 
 export async function getStaticProps() {

diff --git a/test/integration/env-config/app/pages/some-ssg.js b/test/integration/env-config/app/pages/some-ssg.js
@@ -15,6 +15,9 @@ const variables = [
   'LOCAL_TEST_ENV_FILE_KEY',
   'ENV_FILE_TEST_OVERRIDE_TEST',
   'ENV_FILE_TEST_LOCAL_OVERRIDEOVERRIDE_TEST',
+  'ENV_FILE_EXPANDED',
+  'ENV_FILE_EXPANDED_CONCAT',
+  'ENV_FILE_EXPANDED_ESCAPED',
 ]
 
 export async function getStaticProps() {

diff --git a/test/integration/env-config/app/pages/some-ssp.js b/test/integration/env-config/app/pages/some-ssp.js
@@ -15,6 +15,9 @@ const variables = [
   'LOCAL_TEST_ENV_FILE_KEY',
   'ENV_FILE_TEST_OVERRIDE_TEST',
   'ENV_FILE_TEST_LOCAL_OVERRIDEOVERRIDE_TEST',
+  'ENV_FILE_EXPANDED',
+  'ENV_FILE_EXPANDED_CONCAT',
+  'ENV_FILE_EXPANDED_ESCAPED',
 ]
 
 export async function getServerSideProps() {

diff --git a/test/integration/env-config/app/pages/ssp.js b/test/integration/env-config/app/pages/ssp.js
diff --git a/test/integration/env-config/test/index.test.js b/test/integration/env-config/test/index.test.js
@@ -52,6 +52,9 @@ const runTests = (mode = 'dev') => {
     expect(data.LOCAL_PRODUCTION_ENV_FILE_KEY).toBe(
       isDev ? undefined : 'localproduction'
     )
+    expect(data.ENV_FILE_EXPANDED).toBe('env')
+    expect(data.ENV_FILE_EXPANDED_CONCAT).toBe('hello-env')
+    expect(data.ENV_FILE_EXPANDED_ESCAPED).toBe('$ENV_FILE_KEY')
   }
 
   it('should have process environment override .env', async () => {