From 623b47f097b3d64cdf84dffd41a03b29568fb459 Mon Sep 17 00:00:00 2001
From: nisbet-hubbard <87453615+nisbet-hubbard@users.noreply.github.com>
Date: Tue, 16 Apr 2024 22:24:53 +0800
Subject: [PATCH 1/2] Suport .mjs files content-type

---
 docs/example.httpd.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/example.httpd.conf b/docs/example.httpd.conf
index f98b505f2..67127424c 100644
--- a/docs/example.httpd.conf
+++ b/docs/example.httpd.conf
@@ -34,6 +34,7 @@ SSLStaplingCache "shmcb:logs/ssl_stapling(32768)"
          downgrade-1.0 force-response-1.0
   Protocols h2 http/1.1
   LimitRequestBody 157286400
+  AddType application/javascript mjs
   ProxyPass / http://localhost:3000/ upgrade=websocket
   ProxyPassReverse / http://localhost:3000/
 </VirtualHost>

From 7f45d598cbf230002863bbd84004c38252b97031 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 16 May 2024 17:19:24 +0200
Subject: [PATCH 2/2] Fix merge issues with package.json

---
 package.json | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 715da158a..7212e1465 100644
--- a/package.json
+++ b/package.json
@@ -13,19 +13,6 @@
   },
   "dependencies": {
     "@mcrowe/minibloom": "^0.2.0",
-    "chainpad-crypto": "^0.2.5",
-    "chainpad-server": "^5.1.0",
-    "cookie-parser": "^1.4.6",
-    "body-parser": "^1.20.2",
-    "express": "~4.19.2",
-    "fs-extra": "^7.0.0",
-    "get-folder-size": "^2.0.1",
-    "netflux-websocket": "^1.0.0",
-    "http-proxy-middleware": "^2.0.6",
-    "jsonwebtoken": "^9.0.0",
-    "notp": "^2.0.3",
-    "nthen": "0.1.8",
-    "openid-client": "^5.4.2",
     "@node-saml/node-saml": "^4.0.5",
     "alertify.js": "1.0.11",
     "body-parser": "^1.20.2",
@@ -43,7 +30,7 @@
     "croppie": "^2.5.0",
     "dragula": "3.7.2",
     "drawio": "github:cryptpad/drawio-npm#npm-21.8.2+5",
-    "express": "~4.18.2",
+    "express": "~4.19.2",
     "file-saver": "1.3.1",
     "fs-extra": "^7.0.0",
     "get-folder-size": "^2.0.1",