From 22de5628748f00fe9cc39d3398b4a95bd06c6711 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 15:58:35 +0000
Subject: [PATCH] chore: merge

---
 server/config.ts    |  2 +-
 server/package.json |  4 ++--
 server/yarn.lock    | 33 ++++++++++++++++++++++-----------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/server/config.ts b/server/config.ts
index 16d99c4931..b48c3b1035 100644
--- a/server/config.ts
+++ b/server/config.ts
@@ -18,7 +18,7 @@
  */
 
 const dotenv = require('dotenv-extended');
-import {DEFAULT_PASSWORD_MIN_LENGTH} from '@wireapp/commons/src/main/util/ValidationUtil';
+import {DEFAULT_PASSWORD_MIN_LENGTH} from '@wireapp/commons/lib/util/ValidationUtil';
 import * as fs from 'fs-extra';
 import * as logdown from 'logdown';
 import * as path from 'path';
diff --git a/server/package.json b/server/package.json
index f6222c1f10..eab4759cd0 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "@wireapp/commons": "4.4.10",
-    "dotenv": "16.3.1",
+    "@wireapp/commons": "5.2.7",
+    "dotenv": "16.4.5",
     "dotenv-extended": "2.9.0",
     "express": "4.18.2",
     "express-hbs": "2.4.0",
diff --git a/server/yarn.lock b/server/yarn.lock
index 40570dc224..ada2be0d90 100644
--- a/server/yarn.lock
+++ b/server/yarn.lock
@@ -2114,15 +2114,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wireapp/commons@npm:4.4.10":
-  version: 4.4.10
-  resolution: "@wireapp/commons@npm:4.4.10"
+"@wireapp/commons@npm:5.2.7":
+  version: 5.2.7
+  resolution: "@wireapp/commons@npm:5.2.7"
   dependencies:
     ansi-regex: 5.0.1
-    fs-extra: 10.1.0
+    fs-extra: 11.1.0
     logdown: 3.3.1
     platform: 1.3.6
-  checksum: c026b91caffbf8c2abf929abb4e62c33684a1c3bbcde7d6f6164d60a80ce7507969921965fc477145c127eff1b1e3f4d7072f9821c08b8d6cecd9a474894f169
+  checksum: e875e242c706b6719aea8f6dea4b547e6ce189c853dcb78cdbe87d238d3c99e92a8acbf76a80f100ee9642b2638081bafa1b050d8c3fea407fe6f7ea517f6328
   languageName: node
   linkType: hard
 
@@ -3073,10 +3073,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dotenv@npm:16.3.1":
-  version: 16.3.1
-  resolution: "dotenv@npm:16.3.1"
-  checksum: 15d75e7279018f4bafd0ee9706593dd14455ddb71b3bcba9c52574460b7ccaf67d5cf8b2c08a5af1a9da6db36c956a04a1192b101ee102a3e0cf8817bbcf3dfd
+"dotenv@npm:16.4.5":
+  version: 16.4.5
+  resolution: "dotenv@npm:16.4.5"
+  checksum: 301a12c3d44fd49888b74eb9ccf9f07a1f5df43f489e7fcb89647a2edcd84c42d6bc349dc8df099cd18f07c35c7b04685c1a4f3e6a6a9e6b30f8d48c15b7f49c
   languageName: node
   linkType: hard
 
@@ -3527,6 +3527,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fs-extra@npm:11.1.0":
+  version: 11.1.0
+  resolution: "fs-extra@npm:11.1.0"
+  dependencies:
+    graceful-fs: ^4.2.0
+    jsonfile: ^6.0.1
+    universalify: ^2.0.0
+  checksum: 5ca476103fa1f5ff4a9b3c4f331548f8a3c1881edaae323a4415d3153b5dc11dc6a981c8d1dd93eec8367ceee27b53f8bd27eecbbf66ffcdd04927510c171e7f
+  languageName: node
+  linkType: hard
+
 "fs-extra@npm:^8.1.0":
   version: 8.1.0
   resolution: "fs-extra@npm:8.1.0"
@@ -6479,10 +6490,10 @@ __metadata:
     "@types/moment": 2.13.0
     "@types/request": 2.48.8
     "@types/uuid": 9.0.7
-    "@wireapp/commons": 4.4.10
+    "@wireapp/commons": 5.2.7
     "@wireapp/tslint-config": 1.4.1
     cross-env: 7.0.3
-    dotenv: 16.3.1
+    dotenv: 16.4.5
     dotenv-extended: 2.9.0
     express: 4.18.2
     express-hbs: 2.4.0