From cd875640471b40408e61821d1e5e9274eb745756 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Tue, 21 Oct 2025 18:02:23 +0200
Subject: [PATCH] Refactoring

---
 package-lock.json | 66 ++++++++++++++++++++++++++++++++++++++++++-----
 package.json      |  2 ++
 prisma.config.ts  |  3 +--
 3 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bcd6300e5..a80551d77 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -65,6 +65,8 @@
         "countries-list": "3.1.1",
         "countup.js": "2.9.0",
         "date-fns": "4.1.0",
+        "dotenv": "17.2.3",
+        "dotenv-expand": "12.0.3",
         "envalid": "8.1.0",
         "fuse.js": "7.1.0",
         "google-spreadsheet": "3.2.0",
@@ -9080,6 +9082,33 @@
         "rxjs": "^7.1.0"
       }
     },
+    "node_modules/@nestjs/config/node_modules/dotenv": {
+      "version": "16.4.7",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
+      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
+    "node_modules/@nestjs/config/node_modules/dotenv-expand": {
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.1.tgz",
+      "integrity": "sha512-LaKRbou8gt0RNID/9RoI+J2rvXsBRPMV7p+ElHlPhcSARbCPDYcYG2s1TIzAfWv4YSgyY5taidWzzs31lNV3yQ==",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "dotenv": "^16.4.5"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
     "node_modules/@nestjs/core": {
       "version": "11.1.3",
       "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-11.1.3.tgz",
@@ -21036,9 +21065,9 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "16.4.7",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
-      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
+      "version": "17.2.3",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz",
+      "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
@@ -21048,9 +21077,9 @@
       }
     },
     "node_modules/dotenv-expand": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.1.tgz",
-      "integrity": "sha512-LaKRbou8gt0RNID/9RoI+J2rvXsBRPMV7p+ElHlPhcSARbCPDYcYG2s1TIzAfWv4YSgyY5taidWzzs31lNV3yQ==",
+      "version": "12.0.3",
+      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.3.tgz",
+      "integrity": "sha512-uc47g4b+4k/M/SeaW1y4OApx+mtLWl92l5LMPP0GNXctZqELk+YGgOPIIC5elYmUH4OuoK3JLhuRUYegeySiFA==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "dotenv": "^16.4.5"
@@ -21062,6 +21091,18 @@
         "url": "https://dotenvx.com"
       }
     },
+    "node_modules/dotenv-expand/node_modules/dotenv": {
+      "version": "16.6.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
+      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@@ -33451,6 +33492,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/nx/node_modules/dotenv": {
+      "version": "16.4.7",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
+      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
     "node_modules/nx/node_modules/dotenv-expand": {
       "version": "11.0.7",
       "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz",
diff --git a/package.json b/package.json
index a7fc8728b..d1abf3fce 100644
--- a/package.json
+++ b/package.json
@@ -111,6 +111,8 @@
     "countries-list": "3.1.1",
     "countup.js": "2.9.0",
     "date-fns": "4.1.0",
+    "dotenv": "17.2.3",
+    "dotenv-expand": "12.0.3",
     "envalid": "8.1.0",
     "fuse.js": "7.1.0",
     "google-spreadsheet": "3.2.0",
diff --git a/prisma.config.ts b/prisma.config.ts
index a4c21a838..65bb5bd23 100644
--- a/prisma.config.ts
+++ b/prisma.config.ts
@@ -3,8 +3,7 @@ import dotenvExpand from 'dotenv-expand';
 import { join } from 'node:path';
 import { defineConfig } from 'prisma/config';
 
-const myEnv = dotenv.config();
-dotenvExpand.expand(myEnv);
+dotenvExpand.expand(dotenv.config({ quiet: true }));
 
 export default defineConfig({
   migrations: {