Unverified Commit 0a3b64d2 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Add tests for dotenv-expand behavior (#12140)

parent 29f86d90
...@@ -17,7 +17,11 @@ const packageJsonHasDep = (packageJsonPath: string, dep: string): boolean => { ...@@ -17,7 +17,11 @@ const packageJsonHasDep = (packageJsonPath: string, dep: string): boolean => {
return allPackages.some(pkg => pkg === dep) return allPackages.some(pkg => pkg === dep)
} }
let combinedEnv: Env | undefined = undefined
export function loadEnvConfig(dir: string, dev?: boolean): Env | false { export function loadEnvConfig(dir: string, dev?: boolean): Env | false {
if (combinedEnv) return combinedEnv
const packageJson = findUp.sync('package.json', { cwd: dir }) const packageJson = findUp.sync('package.json', { cwd: dir })
// only do new env loading if dotenv isn't installed since we // 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 { ...@@ -61,9 +65,9 @@ export function loadEnvConfig(dir: string, dev?: boolean): Env | false {
'.env', '.env',
].filter(Boolean) as string[] ].filter(Boolean) as string[]
const combinedEnv: Env = { combinedEnv = {
...(process.env as any), ...(process.env as any),
} } as Env
for (const envFile of dotenvFiles) { for (const envFile of dotenvFiles) {
// only load .env if the user provided has an env config file // only load .env if the user provided has an env config file
......
...@@ -7,4 +7,7 @@ ENV_FILE_PRODUCTION_OVERRIDEOVERRIDE_TEST=env ...@@ -7,4 +7,7 @@ ENV_FILE_PRODUCTION_OVERRIDEOVERRIDE_TEST=env
ENV_FILE_PRODUCTION_LOCAL_OVERRIDEOVERRIDE_TEST=env ENV_FILE_PRODUCTION_LOCAL_OVERRIDEOVERRIDE_TEST=env
ENV_FILE_TEST_OVERRIDE_TEST=env ENV_FILE_TEST_OVERRIDE_TEST=env
ENV_FILE_TEST_LOCAL_OVERRIDEOVERRIDE_TEST=env ENV_FILE_TEST_LOCAL_OVERRIDEOVERRIDE_TEST=env
NEXT_PUBLIC_TEST_DEST=another NEXT_PUBLIC_TEST_DEST=another
\ No newline at end of file ENV_FILE_EXPANDED=$ENV_FILE_KEY
ENV_FILE_EXPANDED_CONCAT=hello-${ENV_FILE_KEY}
ENV_FILE_EXPANDED_ESCAPED=\$ENV_FILE_KEY
\ No newline at end of file
...@@ -15,6 +15,9 @@ const variables = [ ...@@ -15,6 +15,9 @@ const variables = [
'LOCAL_TEST_ENV_FILE_KEY', 'LOCAL_TEST_ENV_FILE_KEY',
'ENV_FILE_TEST_OVERRIDE_TEST', 'ENV_FILE_TEST_OVERRIDE_TEST',
'ENV_FILE_TEST_LOCAL_OVERRIDEOVERRIDE_TEST', 'ENV_FILE_TEST_LOCAL_OVERRIDEOVERRIDE_TEST',
'ENV_FILE_EXPANDED',
'ENV_FILE_EXPANDED_CONCAT',
'ENV_FILE_EXPANDED_ESCAPED',
] ]
const items = {} const items = {}
......
...@@ -15,6 +15,9 @@ const variables = [ ...@@ -15,6 +15,9 @@ const variables = [
'LOCAL_TEST_ENV_FILE_KEY', 'LOCAL_TEST_ENV_FILE_KEY',
'ENV_FILE_TEST_OVERRIDE_TEST', 'ENV_FILE_TEST_OVERRIDE_TEST',
'ENV_FILE_TEST_LOCAL_OVERRIDEOVERRIDE_TEST', 'ENV_FILE_TEST_LOCAL_OVERRIDEOVERRIDE_TEST',
'ENV_FILE_EXPANDED',
'ENV_FILE_EXPANDED_CONCAT',
'ENV_FILE_EXPANDED_ESCAPED',
] ]
export async function getStaticProps() { export async function getStaticProps() {
......
...@@ -15,6 +15,9 @@ const variables = [ ...@@ -15,6 +15,9 @@ const variables = [
'LOCAL_TEST_ENV_FILE_KEY', 'LOCAL_TEST_ENV_FILE_KEY',
'ENV_FILE_TEST_OVERRIDE_TEST', 'ENV_FILE_TEST_OVERRIDE_TEST',
'ENV_FILE_TEST_LOCAL_OVERRIDEOVERRIDE_TEST', 'ENV_FILE_TEST_LOCAL_OVERRIDEOVERRIDE_TEST',
'ENV_FILE_EXPANDED',
'ENV_FILE_EXPANDED_CONCAT',
'ENV_FILE_EXPANDED_ESCAPED',
] ]
export async function getStaticProps() { export async function getStaticProps() {
......
...@@ -15,6 +15,9 @@ const variables = [ ...@@ -15,6 +15,9 @@ const variables = [
'LOCAL_TEST_ENV_FILE_KEY', 'LOCAL_TEST_ENV_FILE_KEY',
'ENV_FILE_TEST_OVERRIDE_TEST', 'ENV_FILE_TEST_OVERRIDE_TEST',
'ENV_FILE_TEST_LOCAL_OVERRIDEOVERRIDE_TEST', 'ENV_FILE_TEST_LOCAL_OVERRIDEOVERRIDE_TEST',
'ENV_FILE_EXPANDED',
'ENV_FILE_EXPANDED_CONCAT',
'ENV_FILE_EXPANDED_ESCAPED',
] ]
export async function getServerSideProps() { export async function getServerSideProps() {
......
const variables = [
'PROCESS_ENV_KEY',
'ENV_FILE_KEY',
'LOCAL_ENV_FILE_KEY',
'ENV_FILE_LOCAL_OVERRIDE_TEST',
'PRODUCTION_ENV_FILE_KEY',
'LOCAL_PRODUCTION_ENV_FILE_KEY',
'DEVELOPMENT_ENV_FILE_KEY',
'LOCAL_DEVELOPMENT_ENV_FILE_KEY',
'ENV_FILE_DEVELOPMENT_OVERRIDE_TEST',
'ENV_FILE_DEVELOPMENT_LOCAL_OVERRIDEOVERRIDE_TEST',
'ENV_FILE_PRODUCTION_OVERRIDEOVERRIDE_TEST',
'ENV_FILE_PRODUCTION_LOCAL_OVERRIDEOVERRIDE_TEST',
'TEST_ENV_FILE_KEY',
'LOCAL_TEST_ENV_FILE_KEY',
'ENV_FILE_TEST_OVERRIDE_TEST',
'ENV_FILE_TEST_LOCAL_OVERRIDEOVERRIDE_TEST',
]
export async function getServerSideProps() {
const items = {}
variables.forEach(variable => {
if (process.env[variable]) {
items[variable] = process.env[variable]
}
})
return {
// Do not pass any sensitive values here as they will
// be made PUBLICLY available in `pageProps`
props: { env: items },
}
}
export default ({ env }) => <p>{JSON.stringify(env)}</p>
...@@ -52,6 +52,9 @@ const runTests = (mode = 'dev') => { ...@@ -52,6 +52,9 @@ const runTests = (mode = 'dev') => {
expect(data.LOCAL_PRODUCTION_ENV_FILE_KEY).toBe( expect(data.LOCAL_PRODUCTION_ENV_FILE_KEY).toBe(
isDev ? undefined : 'localproduction' 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 () => { it('should have process environment override .env', async () => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment