Skip to content

Commit d2bdd32

Browse files
authored
move loadEnv to different file i.e. config.ts, to resolve bundling error ?
1 parent 293e337 commit d2bdd32

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

config/config.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,30 @@ import {
1919
DISCORD_PROFILE_SERVICE_STAGING_HELP_GROUP,
2020
DISCORD_PROFILE_SERVICE_DEVELOPMENT_HELP_GROUP,
2121
} from "../src/constants/variables";
22+
import { config as configFromDotEnv } from "dotenv";
23+
24+
export function loadEnv (
25+
env: env,
26+
fromWorkerEnv: boolean
27+
): env {
28+
const Env:env = {
29+
CURRENT_ENVIRONMENT: fromWorkerEnv ? env.CURRENT_ENVIRONMENT : process.env.CURRENT_ENVIRONMENT || '',
30+
DISCORD_APPLICATION_ID: fromWorkerEnv ? env.DISCORD_APPLICATION_ID : process.env.DISCORD_APPLICATION_ID || '',
31+
DISCORD_GUILD_ID: fromWorkerEnv ? env.DISCORD_GUILD_ID : process.env.DISCORD_GUILD_ID || '',
32+
DISCORD_TOKEN: fromWorkerEnv ? env.DISCORD_TOKEN : process.env.DISCORD_TOKEN || '',
33+
DISCORD_PUBLIC_KEY: fromWorkerEnv ? env.DISCORD_PUBLIC_KEY : process.env.DISCORD_PUBLIC_KEY || '',
34+
CLOUDFLARE_API_TOKEN: fromWorkerEnv ? env.CLOUDFLARE_API_TOKEN : process.env.CLOUDFLARE_API_TOKEN || '',
35+
CLOUDFLARE_ACCOUNT_ID: fromWorkerEnv ? env.CLOUDFLARE_ACCOUNT_ID : process.env.CLOUDFLARE_ACCOUNT_ID || '',
36+
BOT_PRIVATE_KEY: fromWorkerEnv ? env.BOT_PRIVATE_KEY : process.env.BOT_PRIVATE_KEY || '',
37+
RDS_SERVERLESS_PUBLIC_KEY: fromWorkerEnv ? env.RDS_SERVERLESS_PUBLIC_KEY : process.env.RDS_SERVERLESS_PUBLIC_KEY || '',
38+
CRON_JOBS_PUBLIC_KEY: fromWorkerEnv ? env.CRON_JOBS_PUBLIC_KEY : process.env.CRON_JOBS_PUBLIC_KEY || '',
39+
IDENTITY_SERVICE_PUBLIC_KEY: fromWorkerEnv ? env.IDENTITY_SERVICE_PUBLIC_KEY : process.env.IDENTITY_SERVICE_PUBLIC_KEY || ''
40+
}
41+
return Env;
42+
}
43+
44+
45+
configFromDotEnv();
2246

2347
const config = (env: env) => {
2448
const environment: environment = {

config/envVarCheck.ts

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,8 @@
11
import { env } from "../src/typeDefinitions/default.types";
2-
import { config } from "dotenv";
2+
import { loadEnv } from "./config";
33

4-
export function loadEnv (
5-
env: env,
6-
fromWorkerEnv: boolean
7-
): env {
8-
const Env:env = {
9-
CURRENT_ENVIRONMENT: fromWorkerEnv ? env.CURRENT_ENVIRONMENT : process.env.CURRENT_ENVIRONMENT || '',
10-
DISCORD_APPLICATION_ID: fromWorkerEnv ? env.DISCORD_APPLICATION_ID : process.env.DISCORD_APPLICATION_ID || '',
11-
DISCORD_GUILD_ID: fromWorkerEnv ? env.DISCORD_GUILD_ID : process.env.DISCORD_GUILD_ID || '',
12-
DISCORD_TOKEN: fromWorkerEnv ? env.DISCORD_TOKEN : process.env.DISCORD_TOKEN || '',
13-
DISCORD_PUBLIC_KEY: fromWorkerEnv ? env.DISCORD_PUBLIC_KEY : process.env.DISCORD_PUBLIC_KEY || '',
14-
CLOUDFLARE_API_TOKEN: fromWorkerEnv ? env.CLOUDFLARE_API_TOKEN : process.env.CLOUDFLARE_API_TOKEN || '',
15-
CLOUDFLARE_ACCOUNT_ID: fromWorkerEnv ? env.CLOUDFLARE_ACCOUNT_ID : process.env.CLOUDFLARE_ACCOUNT_ID || '',
16-
BOT_PRIVATE_KEY: fromWorkerEnv ? env.BOT_PRIVATE_KEY : process.env.BOT_PRIVATE_KEY || '',
17-
RDS_SERVERLESS_PUBLIC_KEY: fromWorkerEnv ? env.RDS_SERVERLESS_PUBLIC_KEY : process.env.RDS_SERVERLESS_PUBLIC_KEY || '',
18-
CRON_JOBS_PUBLIC_KEY: fromWorkerEnv ? env.CRON_JOBS_PUBLIC_KEY : process.env.CRON_JOBS_PUBLIC_KEY || '',
19-
IDENTITY_SERVICE_PUBLIC_KEY: fromWorkerEnv ? env.IDENTITY_SERVICE_PUBLIC_KEY : process.env.IDENTITY_SERVICE_PUBLIC_KEY || ''
20-
}
21-
return Env;
22-
}
23-
24-
25-
config();
264
validateEnv();
275

28-
29-
306
/**
317
* Validate if all the required environment variables defined in the schema above are set
328
* and are in the correct format else throw an error

0 commit comments

Comments
 (0)