From 8b947d635fe097f262aaa74bb216b5b970dde431 Mon Sep 17 00:00:00 2001 From: Vasilica Date: Wed, 12 Jul 2023 19:49:54 +0300 Subject: [PATCH] fix env types conversion --- src/config/environments/react-env.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/config/environments/react-env.ts b/src/config/environments/react-env.ts index 3f19c2020..1ed71d508 100644 --- a/src/config/environments/react-env.ts +++ b/src/config/environments/react-env.ts @@ -3,25 +3,28 @@ export function getReactEnv(varName: string, defaultValue?: string | boolean | number): T { const hasDefaultValue: boolean = arguments.length > 1 + let value = process.env[`REACT_APP_${varName}`] as unknown as T if (value === undefined && !hasDefaultValue) { throw new Error(`${varName} is not defined in process.env!`) } - // convert to boolean - if (value === 'false' || value === 'true') { - value = (value === 'true' as unknown) as T + // convert to number + if (!Number.isNaN(Number(value))) { + value = Number(value as unknown) as T } // convert to null if (value === 'null') { value = (null as unknown) as T + // return early as the bottom expresion will just return the "default value" + return value } - // convert to number - if (!Number.isNaN(Number(value))) { - value = (null as unknown) as T + // convert to boolean + if (value === 'false' || value === 'true') { + value = (value === 'true' as unknown) as T } return (value ?? defaultValue) as T