diff --git a/ExpressAPI/src/InitialImports.ts b/ExpressAPI/src/InitialImports.ts new file mode 100644 index 0000000000000000000000000000000000000000..1ba7814dd1acfaf666c7878f6fb0446b82b7b4c4 --- /dev/null +++ b/ExpressAPI/src/InitialImports.ts @@ -0,0 +1,13 @@ +import path from 'node:path'; + + +if ( process.env.NODE_ENV && process.env.NODE_ENV === 'production' ) { + const myEnv = require('dotenv').config(); + require('dotenv-expand').expand(myEnv); +} else { + require('dotenv').config({ path: path.join(__dirname, '../.env.keys') }); + const myEnv = require('dotenv').config({ DOTENV_KEY: process.env.DOTENV_KEY_DEVELOPMENT }); + require('dotenv-expand').expand(myEnv); +} + +require('./shared/helpers/TypeScriptExtensions'); // ATTENTION : This line MUST be after the dotenv.config() calls diff --git a/ExpressAPI/src/app.ts b/ExpressAPI/src/app.ts index bfbc0494636c237af8dae3185fc2670eb0c51b67..9317f3869137d6789fd35a2dc18fb7c313d48f2b 100644 --- a/ExpressAPI/src/app.ts +++ b/ExpressAPI/src/app.ts @@ -1,17 +1,4 @@ -// Read from the .env file -// ATTENTION : This lines MUST be the first of this file (except for the path import) -const path = require('node:path'); - -if ( process.env.NODE_ENV && process.env.NODE_ENV === 'production' ) { - const myEnv = require('dotenv').config(); - require('dotenv-expand').expand(myEnv); -} else { - require('dotenv').config({ path: path.join(__dirname, '../.env.keys') }); - const myEnv = require('dotenv').config({ DOTENV_KEY: process.env.DOTENV_KEY_DEVELOPMENT }); - require('dotenv-expand').expand(myEnv); -} - -require('./shared/helpers/TypeScriptExtensions'); // ATTENTION : This line MUST be after the dotenv.config() calls +require('./InitialImports'); // ATTENTION : These lines MUST be the first of this file import WorkerRole from './process/WorkerRole'; import ClusterManager from './process/ClusterManager';