Skip to content

Commit 2e6e90b

Browse files
authored
Merge pull request #761 from topcoder-platform/env-fixes
fix env types conversion -> dev
2 parents 565a685 + 8b947d6 commit 2e6e90b

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/config/environments/react-env.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,28 @@
33

44
export function getReactEnv<T>(varName: string, defaultValue?: string | boolean | number): T {
55
const hasDefaultValue: boolean = arguments.length > 1
6+
67
let value = process.env[`REACT_APP_${varName}`] as unknown as T
78

89
if (value === undefined && !hasDefaultValue) {
910
throw new Error(`${varName} is not defined in process.env!`)
1011
}
1112

12-
// convert to boolean
13-
if (value === 'false' || value === 'true') {
14-
value = (value === 'true' as unknown) as T
13+
// convert to number
14+
if (!Number.isNaN(Number(value))) {
15+
value = Number(value as unknown) as T
1516
}
1617

1718
// convert to null
1819
if (value === 'null') {
1920
value = (null as unknown) as T
21+
// return early as the bottom expresion will just return the "default value"
22+
return value
2023
}
2124

22-
// convert to number
23-
if (!Number.isNaN(Number(value))) {
24-
value = (null as unknown) as T
25+
// convert to boolean
26+
if (value === 'false' || value === 'true') {
27+
value = (value === 'true' as unknown) as T
2528
}
2629

2730
return (value ?? defaultValue) as T

0 commit comments

Comments
 (0)