From c4a2ce4e78cf90fc371a62c394f9523b5d62c102 Mon Sep 17 00:00:00 2001
From: Rolf Bachmann <1196109+rolfbachmann@users.noreply.github.com>
Date: Tue, 19 Jul 2022 10:57:52 +0200
Subject: [PATCH 01/30] Add authentication support for ntfy

---
 server/notification-providers/ntfy.js | 11 +++++++++--
 src/components/notifications/Ntfy.vue | 18 +++++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/server/notification-providers/ntfy.js b/server/notification-providers/ntfy.js
index 21f358f64..17d6d812a 100644
--- a/server/notification-providers/ntfy.js
+++ b/server/notification-providers/ntfy.js
@@ -8,12 +8,19 @@ class Ntfy extends NotificationProvider {
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         let okMsg = "Sent Successfully.";
         try {
-            await axios.post(`${notification.ntfyserverurl}`, {
+            let headers = {};
+            if (notification.ntfyusername.length > 0) {
+                headers = {
+                    "Authorization": "Basic " + Buffer.from(notification.ntfyusername + ":" + notification.ntfypassword).toString("base64"),
+                };
+            }
+            let data = {
                 "topic": notification.ntfytopic,
                 "message": msg,
                 "priority": notification.ntfyPriority || 4,
                 "title": "Uptime-Kuma",
-            });
+            };
+            await axios.post(`${notification.ntfyserverurl}`, data, { headers: headers });
 
             return okMsg;
 
diff --git a/src/components/notifications/Ntfy.vue b/src/components/notifications/Ntfy.vue
index d9a83b499..a42dca302 100644
--- a/src/components/notifications/Ntfy.vue
+++ b/src/components/notifications/Ntfy.vue
@@ -11,7 +11,18 @@
             <input id="ntfy-server-url" v-model="$parent.notification.ntfyserverurl" type="text" class="form-control" required>
         </div>
     </div>
-
+    <div class="mb-3">
+        <label for="ntfy-username" class="form-label">{{ $t("Username") }}</label>
+        <div class="input-group mb-3">
+            <input id="ntfy-username" v-model="$parent.notification.ntfyusername" type="text" class="form-control" required>
+        </div>
+    </div>
+    <div class="mb-3">
+        <label for="ntfy-password" class="form-label">{{ $t("Password") }}</label>
+        <div class="input-group mb-3">
+            <HiddenInput id="ntfy-password" v-model="$parent.notification.ntfypassword"></HiddenInput>
+        </div>
+    </div>
     <div class="mb-3">
         <label for="ntfy-priority" class="form-label">{{ $t("Priority") }}</label>
         <input id="ntfy-priority" v-model="$parent.notification.ntfyPriority" type="number" class="form-control" required min="1" max="5" step="1">
@@ -19,7 +30,12 @@
 </template>
 
 <script>
+import HiddenInput from "../HiddenInput.vue";
+
 export default {
+    components: {
+        HiddenInput,
+    },
     mounted() {
         if (typeof this.$parent.notification.ntfyPriority === "undefined") {
             this.$parent.notification.ntfyserverurl = "https://ntfy.sh";

From 4157c7d5463a7467c849dd71fd2d17b846b81c95 Mon Sep 17 00:00:00 2001
From: Patrick <patrick@hindmar.sh>
Date: Mon, 26 Sep 2022 22:16:34 +1300
Subject: [PATCH 02/30] Add support for Squadcast incoming webhook

---
 server/notification-providers/squadcast.js | 76 ++++++++++++++++++++++
 server/notification.js                     |  2 +
 src/components/notifications/Squadcast.vue |  6 ++
 src/components/notifications/index.js      |  2 +
 src/languages/en.js                        |  1 +
 5 files changed, 87 insertions(+)
 create mode 100644 server/notification-providers/squadcast.js
 create mode 100644 src/components/notifications/Squadcast.vue

diff --git a/server/notification-providers/squadcast.js b/server/notification-providers/squadcast.js
new file mode 100644
index 000000000..0302cb6f7
--- /dev/null
+++ b/server/notification-providers/squadcast.js
@@ -0,0 +1,76 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+const { DOWN, UP } = require("../../src/util");
+
+class Squadcast extends NotificationProvider {
+
+    name = "squadcast";
+
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let okMsg = "Sent Successfully.";
+
+        try {
+
+            let config = {};
+            let data = {
+                message: msg,
+                description: '',
+                tags: {},
+                heartbeat: heartbeatJSON,
+                source: 'uptime-kuma'
+            }
+
+            if (heartbeatJSON !== null) {
+                data.description = heartbeatJSON["msg"];
+                data.event_id = heartbeatJSON["monitorID"];
+
+                if (heartbeatJSON["status"] === DOWN) {
+                    data.message = `${monitorJSON['name']} is DOWN`;
+                    data.status = "trigger";
+                } else {
+                    data.message = `${monitorJSON['name']} is UP`;
+                    data.status = "resolve";
+                }
+
+                let address;
+                switch (monitorJSON["type"]) {
+                    case "ping":
+                        address = monitorJSON["hostname"];
+                        break;
+                    case "port":
+                    case "dns":
+                    case "steam":
+                        address = monitorJSON["hostname"];
+                        if (monitorJSON["port"]) {
+                            address += ":" + monitorJSON["port"];
+                        }
+                        break;
+                    default:
+                        address = monitorJSON["url"];
+                        break;
+                }
+
+                data.tags["AlertAddress"] = address;
+
+                monitorJSON["tags"].forEach(tag => {
+                    data.tags[tag["name"]] = {
+                        value: tag["value"]
+                    };
+                    if (tag["color"] !== null) {
+                        data.tags[tag["name"]]["color"] = tag["color"]
+                    }
+                });
+            }
+
+            await axios.post(notification.squadcastWebhookURL, data, config);
+            return okMsg;
+
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+
+    }
+
+}
+
+module.exports = Squadcast;
\ No newline at end of file
diff --git a/server/notification.js b/server/notification.js
index 3bf51243f..7a4b4f29f 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -32,6 +32,7 @@ const SerwerSMS = require("./notification-providers/serwersms");
 const Signal = require("./notification-providers/signal");
 const Slack = require("./notification-providers/slack");
 const SMTP = require("./notification-providers/smtp");
+const Squadcast = require("./notification-providers/squadcast");
 const Stackfield = require("./notification-providers/stackfield");
 const Teams = require("./notification-providers/teams");
 const TechulusPush = require("./notification-providers/techulus-push");
@@ -87,6 +88,7 @@ class Notification {
             new SMSManager(),
             new Slack(),
             new SMTP(),
+            new Squadcast(),
             new Stackfield(),
             new Teams(),
             new TechulusPush(),
diff --git a/src/components/notifications/Squadcast.vue b/src/components/notifications/Squadcast.vue
new file mode 100644
index 000000000..6650c44d9
--- /dev/null
+++ b/src/components/notifications/Squadcast.vue
@@ -0,0 +1,6 @@
+<template>
+    <div class="mb-3">
+        <label for="webhook-url" class="form-label">{{ $t("Post URL") }}</label>
+        <input id="webhook-url" v-model="$parent.notification.squadcastWebhookURL" type="url" pattern="https?://.+" class="form-control" required>
+    </div>
+</template>
diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
index 6add06eaa..319a7922e 100644
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@@ -31,6 +31,7 @@ import SerwerSMS from "./SerwerSMS.vue";
 import Signal from "./Signal.vue";
 import SMSManager from "./SMSManager.vue";
 import Slack from "./Slack.vue";
+import Squadcast from "./Squadcast.vue";
 import Stackfield from "./Stackfield.vue";
 import STMP from "./SMTP.vue";
 import Teams from "./Teams.vue";
@@ -79,6 +80,7 @@ const NotificationFormList = {
     "signal": Signal,
     "SMSManager": SMSManager,
     "slack": Slack,
+    "squadcast": Squadcast,
     "smtp": STMP,
     "stackfield": Stackfield,
     "teams": Teams,
diff --git a/src/languages/en.js b/src/languages/en.js
index 7d980f631..1f20c7eab 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -582,4 +582,5 @@ export default {
     goAlert: "GoAlert",
     backupOutdatedWarning: "Deprecated: Since a lot of features added and this backup feature is a bit unmaintained, it cannot generate or restore a complete backup.",
     backupRecommend: "Please backup the volume or the data folder (./data/) directly instead.",
+    squadcast: "Squadcast",
 };

From bef9cb6a5fb06dbd2fb76c6ce6214b3c3b54b45f Mon Sep 17 00:00:00 2001
From: Patrick <patrick@hindmar.sh>
Date: Mon, 26 Sep 2022 22:30:43 +1300
Subject: [PATCH 03/30] Linting fixes

---
 server/notification-providers/squadcast.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/notification-providers/squadcast.js b/server/notification-providers/squadcast.js
index 0302cb6f7..15553ff7e 100644
--- a/server/notification-providers/squadcast.js
+++ b/server/notification-providers/squadcast.js
@@ -1,6 +1,6 @@
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
-const { DOWN, UP } = require("../../src/util");
+const { DOWN } = require("../../src/util");
 
 class Squadcast extends NotificationProvider {
 
@@ -14,21 +14,21 @@ class Squadcast extends NotificationProvider {
             let config = {};
             let data = {
                 message: msg,
-                description: '',
+                description: "",
                 tags: {},
                 heartbeat: heartbeatJSON,
-                source: 'uptime-kuma'
-            }
+                source: "uptime-kuma"
+            };
 
             if (heartbeatJSON !== null) {
                 data.description = heartbeatJSON["msg"];
                 data.event_id = heartbeatJSON["monitorID"];
 
                 if (heartbeatJSON["status"] === DOWN) {
-                    data.message = `${monitorJSON['name']} is DOWN`;
+                    data.message = `${monitorJSON["name"]} is DOWN`;
                     data.status = "trigger";
                 } else {
-                    data.message = `${monitorJSON['name']} is UP`;
+                    data.message = `${monitorJSON["name"]} is UP`;
                     data.status = "resolve";
                 }
 
@@ -57,7 +57,7 @@ class Squadcast extends NotificationProvider {
                         value: tag["value"]
                     };
                     if (tag["color"] !== null) {
-                        data.tags[tag["name"]]["color"] = tag["color"]
+                        data.tags[tag["name"]]["color"] = tag["color"];
                     }
                 });
             }
@@ -73,4 +73,4 @@ class Squadcast extends NotificationProvider {
 
 }
 
-module.exports = Squadcast;
\ No newline at end of file
+module.exports = Squadcast;

From 929d23810616520a20e5ad875a3e2e9a511af8bf Mon Sep 17 00:00:00 2001
From: FarisDaffa <65797160+Faris0520@users.noreply.github.com>
Date: Sat, 1 Oct 2022 12:17:17 +0700
Subject: [PATCH 04/30] Update id-ID.js

---
 src/languages/id-ID.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/languages/id-ID.js b/src/languages/id-ID.js
index 36ee0341c..3d3c3389b 100644
--- a/src/languages/id-ID.js
+++ b/src/languages/id-ID.js
@@ -130,7 +130,7 @@ export default {
     "Repeat Password": "Ulangi Sandi",
     "Import Backup": "Impor Cadangan",
     "Export Backup": "Expor Cadangan",
-    Export: "Expor",
+    Export: "Ekspor",
     Import: "Impor",
     respTime: "Tanggapan. Waktu (milidetik)",
     notAvailableShort: "N/A",
@@ -192,7 +192,7 @@ export default {
     "Status Pages": "Halaman Status",
     defaultNotificationName: "{notification} saya Peringatan ({number})",
     here: "di sini",
-    Required: "Dibutuhkan",
+    Required: "Wajib",
     telegram: "Telegram",
     "Bot Token": "Bot Token",
     wayToGetTelegramToken: "Anda dapat mendapatkan token dari {0}.",
@@ -210,9 +210,9 @@ export default {
     secureOptionNone: "None / STARTTLS (25, 587)",
     secureOptionTLS: "TLS (465)",
     "Ignore TLS Error": "Abaikan Kesalahan TLS",
-    "From Email": "Dari Surel",
+    "From Email": "Dari Email",
     emailCustomSubject: "Subjek",
-    "To Email": "Ke Surel",
+    "To Email": "Ke Email",
     smtpCC: "CC",
     smtpBCC: "BCC",
     discord: "Discord",
@@ -232,7 +232,7 @@ export default {
     signalImportant: "PENTING: Anda tidak dapat mencampur grup dan nomor di penerima!",
     gotify: "Gotify",
     "Application Token": "Token Aplikasi",
-    "Server URL": "URL Peladen",
+    "Server URL": "URL Server",
     Priority: "Prioritas",
     slack: "Slack",
     "Icon Emoji": "Ikon Emoji",
@@ -274,9 +274,9 @@ export default {
     "LunaSea Device ID": "LunaSea Device ID",
     "Apprise URL": "Apprise URL",
     "Example:": "Contoh: {0}",
-    "Read more:": "Baca lebih lajut: {0}",
+    "Read more:": "Baca lebih lanjut: {0}",
     "Status:": "Status: {0}",
-    "Read more": "Baca lebih lajut",
+    "Read more": "Baca lebih lanjut",
     appriseInstalled: "Apprise diinstall.",
     appriseNotInstalled: "Apprise tidak diinstall. {0}",
     "Access Token": "Token Akses",
@@ -310,7 +310,7 @@ export default {
     BodyInvalidFormat: "Request Body memiliki format JSON yang tidak sesuai: ",
     "Monitor History": "Riyawat Monitor",
     clearDataOlderThan: "Simpan data riwayat monitoring selama {0} hari.",
-    PasswordsDoNotMatch: "Passwords tidak sama.",
+    PasswordsDoNotMatch: "Password tidak sama.",
     records: "catatan",
     "One record": "Satu catatan",
     steamApiKeyDescription: "Untuk monitoring Steam Game Server Anda membutuhkan kunci Steam Web-API. Anda dapat mendaftarkan Kunci API Anda melalui: ",
@@ -322,7 +322,7 @@ export default {
     recent: "Baru saja",
     Done: "Selesai",
     Info: "Info",
-    Security: "Keamaan",
+    Security: "Keamanan",
     "Steam API Key": "Steam API Key",
     "Shrink Database": "Shrink Database",
     "Pick a RR-Type...": "Pilih RR-Type...",
@@ -393,7 +393,7 @@ export default {
     alertaAlertState: "Status Siaga",
     alertaRecoverState: "Status Pemulihan",
     deleteStatusPageMsg: "Apakah Anda yakin untuk menghapus halaman status berikut?",
-    Proxies: "Proxies",
+    Proxies: "Proxy",
     default: "Bawaan",
     enabled: "Diaktifkan",
     setAsDefault: "Tetapkan sebagai bawaan",
@@ -403,7 +403,7 @@ export default {
     setAsDefaultProxyDescription: "Proxy berikut akan diaktifkan sebagai bawaan untuk monitor baru. Anda masih dapat menonaktifkan proxy secara terpisah untuk setiap monitor.",
     "Certificate Chain": "Certificate Chain",
     Valid: "Sahih",
-    Invalid: "Tidak Sahih",
+    Invalid: "Tidak Valid",
     AccessKeyId: "AccessKey ID",
     SecretAccessKey: "AccessKey Secret",
     PhoneNumbers: "Nomor Telepon",
@@ -433,7 +433,7 @@ export default {
     Installed: "Terpasang",
     "Not installed": "Tidak terpasang",
     Running: "Berlari",
-    "Not running": "Tidak berlari",
+    "Not running": "Tidak berjalan",
     "Remove Token": "Hapus Token",
     Start: "Mulai",
     Stop: "Berhenti",
@@ -444,7 +444,7 @@ export default {
     startOrEndWithOnly: "Mulai atau akhiri hanya dengan {0}",
     "No consecutive dashes": "Tanda hubung tidak berurutan",
     Next: "Selanjutnya",
-    "The slug is already taken. Please choose another slug.": "Slug is telah digunakan. Silakan pilih slug lain.",
+    "The slug is already taken. Please choose another slug.": "Slug telah digunakan. Silakan pilih slug lain.",
     "No Proxy": "TIdak ada Proxy",
     Authentication: "Autentikasi",
     "HTTP Basic Auth": "HTTP Basic Auth",

From 2e54dee817f02953393be0167ce71128dbfe8fac Mon Sep 17 00:00:00 2001
From: Matthew Nickson <mnickson@sidingsmedia.com>
Date: Sat, 1 Oct 2022 15:03:28 +0100
Subject: [PATCH 05/30] Fixed Octopush Notifier not working #2144

The version number was passed as a string from the frontend but was
checked against a number in the backend provider. This caused the if else
if to fall through into an error. The literal it is now being compared
has been changed to a string and the unknown version error is no longer
encountered.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
---
 server/notification-providers/octopush.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/notification-providers/octopush.js b/server/notification-providers/octopush.js
index 0eda940ba..524a4a880 100644
--- a/server/notification-providers/octopush.js
+++ b/server/notification-providers/octopush.js
@@ -10,7 +10,7 @@ class Octopush extends NotificationProvider {
 
         try {
         // Default - V2
-            if (notification.octopushVersion === 2 || !notification.octopushVersion) {
+            if (notification.octopushVersion === "2" || !notification.octopushVersion) {
                 let config = {
                     headers: {
                         "api-key": notification.octopushAPIKey,
@@ -31,7 +31,7 @@ class Octopush extends NotificationProvider {
                     "sender": notification.octopushSenderName
                 };
                 await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config);
-            } else if (notification.octopushVersion === 1) {
+            } else if (notification.octopushVersion === "1") {
                 let data = {
                     "user_login": notification.octopushDMLogin,
                     "api_key": notification.octopushDMAPIKey,

From 63e408f4f2c3886874fb8a6cbd9e10a5ee6bd33a Mon Sep 17 00:00:00 2001
From: Matthew Nickson <mnickson@sidingsmedia.com>
Date: Sat, 1 Oct 2022 15:42:34 +0100
Subject: [PATCH 06/30] Fixed octopush legacy doesn't return error code

The octopush legacy API does not return a HTTP error code and instead
always returns a HTTP 200. This means that no error it thrown even if
something like the parameters are incorrect.
Instead the error code is given in the json response data.
Therefore we must look at the response data and check for the presence
of the "error_code" key in the response data.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
---
 server/notification-providers/octopush.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/server/notification-providers/octopush.js b/server/notification-providers/octopush.js
index 524a4a880..35d88f5f3 100644
--- a/server/notification-providers/octopush.js
+++ b/server/notification-providers/octopush.js
@@ -49,7 +49,13 @@ class Octopush extends NotificationProvider {
                     },
                     params: data
                 };
-                await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config);
+
+                // V1 API returns 200 even on error so we must check
+                // response data
+                let response = await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config);
+                if ("error_code" in response.data) {
+                    this.throwGeneralAxiosError(`Octopush error ${JSON.stringify(response.data)}`);
+                }
             } else {
                 throw new Error("Unknown Octopush version!");
             }

From 97de3959cd3c71d17bcfa32a2a3ec131c3255e9b Mon Sep 17 00:00:00 2001
From: Matthew Nickson <mnickson@sidingsmedia.com>
Date: Sat, 1 Oct 2022 19:48:00 +0100
Subject: [PATCH 07/30] Updated octopush error handling to accept 000

The legacy octopush API includes an error code with all responses. A
code other than 000 is an error.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
---
 server/notification-providers/octopush.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/notification-providers/octopush.js b/server/notification-providers/octopush.js
index 35d88f5f3..d5c475d3d 100644
--- a/server/notification-providers/octopush.js
+++ b/server/notification-providers/octopush.js
@@ -54,7 +54,9 @@ class Octopush extends NotificationProvider {
                 // response data
                 let response = await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config);
                 if ("error_code" in response.data) {
-                    this.throwGeneralAxiosError(`Octopush error ${JSON.stringify(response.data)}`);
+                    if (response.data.error_code !== "000") {
+                        this.throwGeneralAxiosError(`Octopush error ${JSON.stringify(response.data)}`);
+                    }
                 }
             } else {
                 throw new Error("Unknown Octopush version!");

From 6a3eccf6a6631e249658c749f6a1bd3466347f92 Mon Sep 17 00:00:00 2001
From: Matthew Nickson <mnickson@sidingsmedia.com>
Date: Sun, 2 Oct 2022 02:26:38 +0100
Subject: [PATCH 08/30] Fixed alert features unnecessary URL field #2009

The filling of the URL field was incorrect previously. It has been
updated to handle new monitor types.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
---
 server/notification-providers/teams.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/server/notification-providers/teams.js b/server/notification-providers/teams.js
index c398e03c2..bcfc82c24 100644
--- a/server/notification-providers/teams.js
+++ b/server/notification-providers/teams.js
@@ -63,7 +63,7 @@ class Teams extends NotificationProvider {
             });
         }
 
-        if (monitorUrl) {
+        if (monitorUrl && monitorUrl !== "https://") {
             facts.push({
                 name: "URL",
                 value: monitorUrl,
@@ -127,13 +127,17 @@ class Teams extends NotificationProvider {
 
             let url;
 
-            if (monitorJSON["type"] === "port") {
-                url = monitorJSON["hostname"];
-                if (monitorJSON["port"]) {
-                    url += ":" + monitorJSON["port"];
-                }
-            } else {
-                url = monitorJSON["url"];
+            switch (monitorJSON["type"]) {
+                case "http":
+                case "keywork":
+                    url = monitorJSON["url"];
+                    break;
+                case "docker":
+                    url = monitorJSON["docker_host"];
+                    break;
+                default:
+                    url = monitorJSON["hostname"];
+                    break;
             }
 
             const payload = this._notificationPayloadFactory({

From ed7bc0e6d194f603eb6ca658b47560c10eeb1c2a Mon Sep 17 00:00:00 2001
From: MrEddX <66828538+MrEddX@users.noreply.github.com>
Date: Sun, 2 Oct 2022 09:55:58 +0300
Subject: [PATCH 09/30] Update bg-BG.js

Added New Fields
---
 src/languages/bg-BG.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/languages/bg-BG.js b/src/languages/bg-BG.js
index a234e56f6..2002bc46a 100644
--- a/src/languages/bg-BG.js
+++ b/src/languages/bg-BG.js
@@ -562,4 +562,24 @@ export default {
     "Docker Host": "Docker хост",
     "Docker Hosts": "Docker хостове",
     trustProxyDescription: "Trust 'X-Forwarded-*' headers.  Ако искате да получавате правилния IP адрес на клиента, а Uptime Kuma е зад системи като Nginx или Apache, трябва да разрешите тази опция.",
+    Examples: "Примери",
+    "Home Assistant URL": "Home Assistant URL адрес",
+    "Long-Lived Access Token": "Long-Lived Access Token",
+    "Long-Lived Access Token can be created by clicking on your profile name (bottom left) and scrolling to the bottom then click Create Token. ": "Long-Lived Access Token можете да създадете, като кликнете върху името на профила си (долу ляво) и превъртите до най-долу, след това кликнете върху Създаване на токен. ",
+    "Notification Service": "Услуга за известяване",
+    "default: notify all devices": "по подразбиране: извести всички устройства",
+    "A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.": "Списък с услугите за известяване може да бъде намерен в Home Assistant под \"Developer Tools > Services\", там потърсете \"notification\", за да намерите името на вашето устройство/телефон.",
+    "Automations can optionally be triggered in Home Assistant:": "Автоматизациите могат да се задействат при нужда в Home Assistant:",
+    "Trigger type:": "Задействане тип:",
+    "Event type:": "Събитие тип:",
+    "Event data:": "Събитие данни:",
+    "Then choose an action, for example switch the scene to where an RGB light is red.": "След което изберете действие, например да превключите сцената, където RGB светлината е червена.",
+    "Frontend Version": "Фронтенд версия",
+    "Frontend Version do not match backend version!": "Фронтенд версията не съвпада с Бекенд версията!",
+    "Base URL": "Базов  URL адрес",
+    goAlertInfo: "GoAlert е приложение с отворен код за планиране на повиквания, автоматизирани ескалации и известия (като SMS или гласови повиквания). Автоматично ангажирайте точния човек, по точния начин и в точното време! {0}",
+    goAlertIntegrationKeyInfo: "Вземете общ API интеграционен ключ за услугата във формат \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" обикновено стойността на параметъра token на копирания URL адрес.",
+    goAlert: "GoAlert",
+    backupOutdatedWarning: "Отпаднало: Тъй като са добавени много функции, тази опция за архивиране не е достатъчно поддържана и не може да генерира или възстанови пълен архив.",
+    backupRecommend: "Моля, архивирайте дяла или папката (./data/) директно вместо това.",
 };

From da34685019b6902b3464423a72f3b867a614a1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=20=7C=20Anton=20R=C3=B6hm?=
 <18481195+AnTheMaker@users.noreply.github.com>
Date: Sun, 2 Oct 2022 13:38:33 +0200
Subject: [PATCH 10/30] fix typos

---
 CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e9829c96f..12fd6ed41 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,7 +27,7 @@ The frontend code build into "dist" directory. The server (express.js) exposes t
 
 ## Can I create a pull request for Uptime Kuma?
 
-Yes or no, it depends on what you will try to do. Since I don't want to waste your time, be sure to **create empty draft pull request or open an issue, so we can discuss first**. Especially for a large pull request or you don't know it will be merged or not.
+Yes or no, it depends on what you will try to do. Since I don't want to waste your time, be sure to **create an empty draft pull request or open an issue, so we can discuss first**. Especially for a large pull request or you don't know it will be merged or not.
 
 Here are some references:
 
@@ -48,7 +48,7 @@ Here are some references:
 - UI/UX is not close to Uptime Kuma 
 - Existing logic is completely modified or deleted for no reason
 - A function that is completely out of scope
-- Unnesscary large code changes (Hard to review, casuse code conflicts to other pull requests)
+- Unnecessary large code changes (Hard to review, causes code conflicts to other pull requests)
 
 I will mark your pull request in the [milestones](https://github.com/louislam/uptime-kuma/milestones), if I am plan to review and merge it.
 
@@ -183,7 +183,7 @@ By default, the Chromium window will be shown up during the test. Specifying `HE
 
 ## Dependencies
 
-Both frontend and backend share the same package.json. However, the frontend dependencies are eventually not be used in production environment, because it is usually also baked into dist files. So:
+Both frontend and backend share the same package.json. However, the frontend dependencies are eventually not used in the production environment, because it is usually also baked into dist files. So:
 
 - Frontend dependencies = "devDependencies"
   - Examples: vue, chart.js

From 8595824b5dd7ce4eb94d9e554be77e5f9fc982ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=20=7C=20Anton=20R=C3=B6hm?=
 <18481195+AnTheMaker@users.noreply.github.com>
Date: Sun, 2 Oct 2022 13:49:40 +0200
Subject: [PATCH 11/30] Improve German translation

---
 src/languages/de-DE.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/de-DE.js b/src/languages/de-DE.js
index bd5bf87d9..a6ae40771 100644
--- a/src/languages/de-DE.js
+++ b/src/languages/de-DE.js
@@ -68,7 +68,7 @@ export default {
     Timezone: "Zeitzone",
     "Search Engine Visibility": "Sichtbarkeit für Suchmaschinen",
     "Allow indexing": "Indizierung zulassen",
-    "Discourage search engines from indexing site": "Halte Suchmaschinen von der Indexierung der Seite ab",
+    "Discourage search engines from indexing site": "Suchmaschinen darum bitten, die Seite nicht zu indizieren",
     "Change Password": "Passwort ändern",
     "Current Password": "Aktuelles Passwort",
     "New Password": "Neues Passwort",
@@ -78,7 +78,7 @@ export default {
     "Disable Auth": "Authentifizierung deaktivieren",
     "Enable Auth": "Authentifizierung aktivieren",
     "disableauth.message1": "Bist du sicher das du die <strong>Authentifizierung deaktivieren</strong> möchtest?",
-    "disableauth.message2": "Es ist für <strong>jemanden der eine externe Authentifizierung</strong> vor Uptime Kuma geschaltet hat, wie z.B. Cloudflare Access.",
+    "disableauth.message2": "Dies ist für Szenarien gedacht, <strong>in denen man eine externe Authentifizierung</strong> vor Uptime Kuma geschaltet hat, wie z.B. Cloudflare Access, Authelia oder andere Authentifizierungsmechanismen.",
     "Please use this option carefully!": "Bitte mit Vorsicht nutzen.",
     Logout: "Ausloggen",
     notificationDescription: "Benachrichtigungen müssen einem Monitor zugewiesen werden, damit diese funktionieren.",
@@ -559,7 +559,7 @@ export default {
     "ntfy Topic": "ntfy Thema",
     Domain: "Domain",
     Workstation: "Workstation",
-    disableCloudflaredNoAuthMsg: "Du bist im nicht-authentifizieren modus, ein Passwort wird nicht benötigt.",
+    disableCloudflaredNoAuthMsg: "Du bist im nicht-authentifizieren Modus, ein Passwort wird nicht benötigt.",
     trustProxyDescription: "Vertraue 'X-Forwarded-*' headern. Wenn man die richtige client IP haben möchte und Uptime Kuma hinter einem Proxy wie Nginx or Apache läuft, wollte dies aktiviert werden.",
     wayToGetLineNotifyToken: "Du kannst hier ein Token erhalten: {0}",
     Examples: "Beispiele",

From f6ac09b7513afccfed2c1e8a01921e3562351869 Mon Sep 17 00:00:00 2001
From: SametKUM <kumsamet@gmail.com>
Date: Sun, 2 Oct 2022 21:14:00 +0300
Subject: [PATCH 12/30] fix some translations

---
 src/languages/tr-TR.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/tr-TR.js b/src/languages/tr-TR.js
index 75bc103c4..1bf949932 100644
--- a/src/languages/tr-TR.js
+++ b/src/languages/tr-TR.js
@@ -224,7 +224,7 @@ export default {
     teams: "Microsoft Teams",
     "Webhook URL": "Webhook URL",
     wayToGetTeamsURL: "Bir webhook URL'sinin nasıl oluşturulacağını öğrenebilirsiniz {0}.",
-    signal: "Signal",
+    signal: "Sinyal",
     Number: "Numara",
     Recipients: "Alıcılar",
     needSignalAPI: "REST API ile bir signal istemciniz olması gerekiyor.",
@@ -552,14 +552,14 @@ export default {
     deleteDockerHostMsg: "Bu docker ana bilgisayarını tüm monitörler için silmek istediğinizden emin misiniz?",
     socket: "Soket",
     tcp: "TCP / HTTP",
-    "Docker Container": "Docker Konteyneri",
+    "Docker Container": "Docker Konteyner",
     "Container Name / ID": "Konteyner Adı / Kimliği",
     "Docker Host": "Docker Ana Bilgisayarı",
     "Docker Hosts": "Docker Ana Bilgisayarları",
     "ntfy Topic": "ntfy Konu",
     Domain: "Domain",
     Workstation: "İş İstasyonu",
-    disableCloudflaredNoAuthMsg: "Yetki Yok modundasınız, şifre gerekli değil.",
+    disableCloudflaredNoAuthMsg: "Yetki yok modundasınız, şifre gerekli değil.",
     trustProxyDescription: "'X-Forwarded-*' başlıklarına güvenin. Doğru istemci IP'sini almak istiyorsanız ve Uptime Kuma'nız Nginx veya Apache'nin arkasındaysa, bunu etkinleştirmelisiniz.",
     wayToGetLineNotifyToken: "{0} adresinden bir erişim jetonu alabilirsiniz.",
     Examples: "Örnekler",

From d39a4770e05edf42c545af412bf23cde9c6f8d1a Mon Sep 17 00:00:00 2001
From: 5idereal <nelson22768384@gmail.com>
Date: Mon, 3 Oct 2022 13:11:39 +0800
Subject: [PATCH 13/30] sync

---
 src/languages/zh-TW.js | 56 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 50 insertions(+), 6 deletions(-)

diff --git a/src/languages/zh-TW.js b/src/languages/zh-TW.js
index 3405c02ab..afb1fabc4 100644
--- a/src/languages/zh-TW.js
+++ b/src/languages/zh-TW.js
@@ -2,6 +2,8 @@ export default {
     languageName: "繁體中文 (台灣)",
     checkEverySecond: "每 {0} 秒檢查一次",
     retryCheckEverySecond: "每 {0} 秒重試一次",
+    resendEveryXTimes: "Resend every {0} times",
+    resendDisabled: "Resend disabled",
     retriesDescription: "在服務被標記為離線並傳送通知前的最大重試次數",
     ignoreTLSError: "忽略 HTTPS 網站的 TLS/SSL 錯誤",
     upsideDownModeDescription: "反轉顯示狀態。若服務可以連線，將顯示離線。",
@@ -72,6 +74,7 @@ export default {
     "Heartbeat Interval": "心跳間隔",
     Retries: "重試次數",
     "Heartbeat Retry Interval": "心跳重試間隔",
+    "Resend Notification if Down X times consequently": "若 X 次心跳皆離線，重新傳送通知",
     Advanced: "進階",
     "Upside Down Mode": "顛倒模式",
     "Max. Redirects": "最大重新導向次數",
@@ -455,6 +458,8 @@ export default {
     "Message:": "訊息：",
     "Don't know how to get the token? Please read the guide:": "不知道如何取得權杖嗎？請閱讀指南：",
     "The current connection may be lost if you are currently connecting via Cloudflare Tunnel. Are you sure want to stop it? Type your current password to confirm it.": "如果您目前正透過 Cloudflare Tunnel 連線，可能會導致連線中斷。您確定要停止嗎？請輸入密碼以確認。",
+    "HTTP Headers": "HTTP 標頭",
+    "Trust Proxy": "信任的 Proxy",
     "Other Software": "其他軟體",
     "For example: nginx, Apache and Traefik.": "例如 nginx、Apache 和 Traefik。",
     "Please read": "請閱覽",
@@ -467,6 +472,7 @@ export default {
     "Domain Name Expiry Notification": "網域名稱到期通知",
     Proxy: "Proxy",
     "Date Created": "建立日期",
+    HomeAssistant: "Home Assistant",
     onebotHttpAddress: "OneBot HTTP 位址",
     onebotMessageType: "OneBot 訊息類型",
     onebotGroupMessage: "群組",
@@ -479,6 +485,12 @@ export default {
     "Domain Names": "網域名稱",
     signedInDisp: "以 {0} 身分登入",
     signedInDispDisabled: "驗證已停用。",
+    RadiusSecret: "Radius Secret",
+    RadiusSecretDescription: "Shared Secret between client and server",
+    RadiusCalledStationId: "Called Station Id",
+    RadiusCalledStationIdDescription: "Identifier of the called device",
+    RadiusCallingStationId: "Calling Station Id",
+    RadiusCallingStationIdDescription: "Identifier of the calling device",
     "Certificate Expiry Notification": "憑證到期通知",
     "API Username": "API 使用者名稱",
     "API Key": "API 金鑰",
@@ -504,9 +516,9 @@ export default {
     "pushoversounds intermission": "中場休息",
     "pushoversounds magic": "魔法",
     "pushoversounds mechanical": "機械",
-    "pushoversounds pianobar": "Piano Bar",
-    "pushoversounds siren": "Siren",
-    "pushoversounds spacealarm": "Space Alarm",
+    "pushoversounds pianobar": "鋼琴酒吧",
+    "pushoversounds siren": "警鈴",
+    "pushoversounds spacealarm": "太空鬧鐘",
     "pushoversounds tugboat": "汽笛",
     "pushoversounds alien": "外星鬧鐘 (長)",
     "pushoversounds climb": "爬升 (長)",
@@ -531,11 +543,43 @@ export default {
     "Coming Soon": "即將推出",
     wayToGetClickSendSMSToken: "您可以從 {0} 取得 API 使用者名稱和金鑰。",
     "Connection String": "連線字串",
-    "Query": "查詢",
+    Query: "查詢",
     settingsCertificateExpiry: "TLS 憑證到期",
     certificationExpiryDescription: "TLS 將於 X 天後到期時觸發 HTTPS 監測器通知：",
+    "Setup Docker Host": "設定 Docker 主機",
+    "Connection Type": "連線類型",
+    "Docker Daemon": "Docker 精靈",
+    deleteDockerHostMsg: "您確定要為所有監測器刪除此 Docker 主機嗎？",
+    socket: "通訊端",
+    tcp: "TCP / HTTP",
+    "Docker Container": "Docker 容器",
+    "Container Name / ID": "容器名稱 / ID",
+    "Docker Host": "Docker 主機",
+    "Docker Hosts": "Docker 主機",
     "ntfy Topic": "ntfy 主題",
-    "Domain": "網域",
-    "Workstation": "工作站",
+    Domain: "網域",
+    Workstation: "工作站",
     disableCloudflaredNoAuthMsg: "您處於無驗證模式。無須輸入密碼。",
+    trustProxyDescription: "Trust 'X-Forwarded-*' headers. If you want to get the correct client IP and your Uptime Kuma is behind such as Nginx or Apache, you should enable this. 如果您的 Uptime Kuma 架設於 Nginx 或 Apache ",
+    wayToGetLineNotifyToken: "您可以從 {0} 取得存取權杖",
+    Examples: "範例",
+    "Home Assistant URL": "Home Assistant 網址",
+    "Long-Lived Access Token": "長期有效存取權杖",
+    "Long-Lived Access Token can be created by clicking on your profile name (bottom left) and scrolling to the bottom then click Create Token. ": "若要建立長期有效存取權杖，請點擊您的個人檔案名稱 (左下角)，捲動至最下方，然後點擊建立權杖。",
+    "Notification Service": "通知服務",
+    "default: notify all devices": "預設：通知所有服務",
+    "A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.": "A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.",
+    "Automations can optionally be triggered in Home Assistant:": " 	自動化程序可以 can optionally be triggered in Home Assistant:",
+    "Trigger type:": "觸發器類型：",
+    "Event type:": "事件類型：",
+    "Event data:": "事件資料：",
+    "Then choose an action, for example switch the scene to where an RGB light is red.": "Then choose an action, for example switch the scene to where an RGB light is red.",
+    "Frontend Version": "前端版本",
+    "Frontend Version do not match backend version!": "前端版本與後端版本不符！",
+    "Base URL": "Base URL",
+    goAlertInfo: "GoAlert 是用於待命排程、升級自動化，以及通知 (如簡訊或語音通話) 的開源應用程式。自動在正確的時間、用洽當的方法、聯絡合適的人！ {0}",
+    goAlertIntegrationKeyInfo: "Get generic API integration key for the service in this format \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" usually the value of token parameter of copied URL.",
+    goAlert: "GoAlert",
+    backupOutdatedWarning: "Deprecated: Since a lot of features added and this backup feature is a bit unmaintained, it cannot generate or restore a complete backup. 由於新功能的增加，且此備份功能，故",
+    backupRecommend: "Please backup the volume or the data folder (./data/) directly instead. 請直接備份或 ./data/ 資料夾",
 };

From 7672057319c28ec2957622abbcb2559e3cf5abc6 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Mon, 3 Oct 2022 15:51:29 +0800
Subject: [PATCH 14/30] [ntfy] Do not autofill

---
 src/components/notifications/Ntfy.vue | 14 +++++++-------
 src/languages/en.js                   |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/notifications/Ntfy.vue b/src/components/notifications/Ntfy.vue
index a42dca302..ddcc39174 100644
--- a/src/components/notifications/Ntfy.vue
+++ b/src/components/notifications/Ntfy.vue
@@ -12,21 +12,21 @@
         </div>
     </div>
     <div class="mb-3">
-        <label for="ntfy-username" class="form-label">{{ $t("Username") }}</label>
+        <label for="ntfy-priority" class="form-label">{{ $t("Priority") }}</label>
+        <input id="ntfy-priority" v-model="$parent.notification.ntfyPriority" type="number" class="form-control" required min="1" max="5" step="1">
+    </div>
+    <div class="mb-3">
+        <label for="ntfy-username" class="form-label">{{ $t("Username") }} ({{ $t("Optional") }})</label>
         <div class="input-group mb-3">
             <input id="ntfy-username" v-model="$parent.notification.ntfyusername" type="text" class="form-control" required>
         </div>
     </div>
     <div class="mb-3">
-        <label for="ntfy-password" class="form-label">{{ $t("Password") }}</label>
+        <label for="ntfy-password" class="form-label">{{ $t("Password") }} ({{ $t("Optional") }})</label>
         <div class="input-group mb-3">
-            <HiddenInput id="ntfy-password" v-model="$parent.notification.ntfypassword"></HiddenInput>
+            <HiddenInput id="ntfy-password" v-model="$parent.notification.ntfypassword" autocomplete="new-password"></HiddenInput>
         </div>
     </div>
-    <div class="mb-3">
-        <label for="ntfy-priority" class="form-label">{{ $t("Priority") }}</label>
-        <input id="ntfy-priority" v-model="$parent.notification.ntfyPriority" type="number" class="form-control" required min="1" max="5" step="1">
-    </div>
 </template>
 
 <script>
diff --git a/src/languages/en.js b/src/languages/en.js
index 7d980f631..00e9551f1 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -582,4 +582,5 @@ export default {
     goAlert: "GoAlert",
     backupOutdatedWarning: "Deprecated: Since a lot of features added and this backup feature is a bit unmaintained, it cannot generate or restore a complete backup.",
     backupRecommend: "Please backup the volume or the data folder (./data/) directly instead.",
+    "Optional": "Optional",
 };

From c2c3f981bcd1e6c487d2260b51542a816b36e763 Mon Sep 17 00:00:00 2001
From: 5idereal <nelson22768384@gmail.com>
Date: Mon, 3 Oct 2022 18:03:15 +0800
Subject: [PATCH 15/30] update zh-tw translation

---
 src/languages/zh-TW.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/languages/zh-TW.js b/src/languages/zh-TW.js
index afb1fabc4..e677d27e0 100644
--- a/src/languages/zh-TW.js
+++ b/src/languages/zh-TW.js
@@ -2,8 +2,8 @@ export default {
     languageName: "繁體中文 (台灣)",
     checkEverySecond: "每 {0} 秒檢查一次",
     retryCheckEverySecond: "每 {0} 秒重試一次",
-    resendEveryXTimes: "Resend every {0} times",
-    resendDisabled: "Resend disabled",
+    resendEveryXTimes: "每 {0} 次便重新傳送",
+    resendDisabled: "重新傳送已停用",
     retriesDescription: "在服務被標記為離線並傳送通知前的最大重試次數",
     ignoreTLSError: "忽略 HTTPS 網站的 TLS/SSL 錯誤",
     upsideDownModeDescription: "反轉顯示狀態。若服務可以連線，將顯示離線。",
@@ -486,11 +486,11 @@ export default {
     signedInDisp: "以 {0} 身分登入",
     signedInDispDisabled: "驗證已停用。",
     RadiusSecret: "Radius Secret",
-    RadiusSecretDescription: "Shared Secret between client and server",
-    RadiusCalledStationId: "Called Station Id",
-    RadiusCalledStationIdDescription: "Identifier of the called device",
-    RadiusCallingStationId: "Calling Station Id",
-    RadiusCallingStationIdDescription: "Identifier of the calling device",
+    RadiusSecretDescription: "客戶端與伺服器端的共享機密",
+    RadiusCalledStationId: "被叫站 Id",
+    RadiusCalledStationIdDescription: "被呼叫裝置的識別碼",
+    RadiusCallingStationId: "呼叫站 Id",
+    RadiusCallingStationIdDescription: "呼叫裝置的識別碼",
     "Certificate Expiry Notification": "憑證到期通知",
     "API Username": "API 使用者名稱",
     "API Key": "API 金鑰",
@@ -500,8 +500,8 @@ export default {
     "Octopush API Version": "Octopush API 版本",
     "Legacy Octopush-DM": "舊版 Octopush-DM",
     "endpoint": "端",
-    octopushAPIKey: "\"API key\" from HTTP API credentials in control panel",
-    octopushLogin: "\"Login\" from HTTP API credentials in control panel",
+    octopushAPIKey: "在控制台的 HTTP API 憑證取得的 \"API 金鑰\"",
+    octopushLogin: "在控制台的 HTTP API 憑證取得的 \"Login\"",
     promosmsLogin: "API 登入名稱",
     promosmsPassword: "API 密碼",
     "pushoversounds pushover": "Pushover (預設)",
@@ -560,7 +560,7 @@ export default {
     Domain: "網域",
     Workstation: "工作站",
     disableCloudflaredNoAuthMsg: "您處於無驗證模式。無須輸入密碼。",
-    trustProxyDescription: "Trust 'X-Forwarded-*' headers. If you want to get the correct client IP and your Uptime Kuma is behind such as Nginx or Apache, you should enable this. 如果您的 Uptime Kuma 架設於 Nginx 或 Apache ",
+    trustProxyDescription: "信任 'X-Forwarded-*' 標頭。如果您想要取得正確的客戶端 IP，且您的 Uptime Kuma 架設於 Nginx 或 Apache 後方，您應啟用此選項。",
     wayToGetLineNotifyToken: "您可以從 {0} 取得存取權杖",
     Examples: "範例",
     "Home Assistant URL": "Home Assistant 網址",
@@ -568,18 +568,18 @@ export default {
     "Long-Lived Access Token can be created by clicking on your profile name (bottom left) and scrolling to the bottom then click Create Token. ": "若要建立長期有效存取權杖，請點擊您的個人檔案名稱 (左下角)，捲動至最下方，然後點擊建立權杖。",
     "Notification Service": "通知服務",
     "default: notify all devices": "預設：通知所有服務",
-    "A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.": "A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.",
-    "Automations can optionally be triggered in Home Assistant:": " 	自動化程序可以 can optionally be triggered in Home Assistant:",
+    "A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.": "您可以在 Home Assistant 中查看通知服務的列表，在\"開發者工具 > 服務\"下搜尋\"通知\"來找到您的裝置/手機的名稱。",
+    "Automations can optionally be triggered in Home Assistant:": "可以選擇在 Home Assistant 中觸發自動化程序：",
     "Trigger type:": "觸發器類型：",
     "Event type:": "事件類型：",
     "Event data:": "事件資料：",
-    "Then choose an action, for example switch the scene to where an RGB light is red.": "Then choose an action, for example switch the scene to where an RGB light is red.",
+    "Then choose an action, for example switch the scene to where an RGB light is red.": "然後選擇動作，例如切換至 RGB 燈為紅色的場景。",
     "Frontend Version": "前端版本",
     "Frontend Version do not match backend version!": "前端版本與後端版本不符！",
-    "Base URL": "Base URL",
+    "Base URL": "基底網址",
     goAlertInfo: "GoAlert 是用於待命排程、升級自動化，以及通知 (如簡訊或語音通話) 的開源應用程式。自動在正確的時間、用洽當的方法、聯絡合適的人！ {0}",
-    goAlertIntegrationKeyInfo: "Get generic API integration key for the service in this format \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" usually the value of token parameter of copied URL.",
+    goAlertIntegrationKeyInfo: "取得服務的通用 API 整合金鑰，格式為 \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\"。通常是已複製的網址的權杖參數值。",
     goAlert: "GoAlert",
-    backupOutdatedWarning: "Deprecated: Since a lot of features added and this backup feature is a bit unmaintained, it cannot generate or restore a complete backup. 由於新功能的增加，且此備份功能，故",
-    backupRecommend: "Please backup the volume or the data folder (./data/) directly instead. 請直接備份或 ./data/ 資料夾",
+    backupOutdatedWarning: "過時：由於新功能的增加，且未妥善維護，故此備份功能無法產生或復原完整備份。",
+    backupRecommend: "請直接備份磁碟區或 ./data/ 資料夾。",
 };

From 068675716086fe8cd24922dddc6c7d2db5c07a95 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Tue, 4 Oct 2022 16:19:56 +0800
Subject: [PATCH 16/30] [Docker Monitor] Change `tcp://` to `http://`

---
 server/docker.js                                | 14 +++++++++++++-
 server/model/monitor.js                         |  3 ++-
 server/socket-handlers/docker-socket-handler.js |  2 +-
 src/components/DockerHostDialog.vue             |  3 ++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/server/docker.js b/server/docker.js
index 177fa6cb6..ff2315027 100644
--- a/server/docker.js
+++ b/server/docker.js
@@ -75,7 +75,7 @@ class DockerHost {
         if (dockerHost.dockerType === "socket") {
             options.socketPath = dockerHost.dockerDaemon;
         } else if (dockerHost.dockerType === "tcp") {
-            options.baseURL = dockerHost.dockerDaemon;
+            options.baseURL = DockerHost.patchDockerURL(dockerHost.dockerDaemon);
         }
 
         let res = await axios.request(options);
@@ -99,6 +99,18 @@ class DockerHost {
         }
 
     }
+
+    /**
+     * Since axios 0.27.X, it does not accept `tcp://` protocol.
+     * Change it to `http://` on the fly in order to fix it. (https://github.com/louislam/uptime-kuma/issues/2165)
+     */
+    static patchDockerURL(url) {
+        if (typeof url === "string") {
+            // Replace the first occurrence only with g
+            return url.replace(/tcp:\/\//g, "http://");
+        }
+        return url;
+    }
 }
 
 module.exports = {
diff --git a/server/model/monitor.js b/server/model/monitor.js
index f96b4df06..ac8925608 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -17,6 +17,7 @@ const version = require("../../package.json").version;
 const apicache = require("../modules/apicache");
 const { UptimeKumaServer } = require("../uptime-kuma-server");
 const { CacheableDnsHttpAgent } = require("../cacheable-dns-http-agent");
+const { DockerHost } = require("../docker");
 
 /**
  * status:
@@ -498,7 +499,7 @@ class Monitor extends BeanModel {
                     if (dockerHost._dockerType === "socket") {
                         options.socketPath = dockerHost._dockerDaemon;
                     } else if (dockerHost._dockerType === "tcp") {
-                        options.baseURL = dockerHost._dockerDaemon;
+                        options.baseURL = DockerHost.patchDockerURL(dockerHost._dockerDaemon);
                     }
 
                     log.debug(`[${this.name}] Axios Request`);
diff --git a/server/socket-handlers/docker-socket-handler.js b/server/socket-handlers/docker-socket-handler.js
index 5a53494db..542f18cef 100644
--- a/server/socket-handlers/docker-socket-handler.js
+++ b/server/socket-handlers/docker-socket-handler.js
@@ -56,7 +56,7 @@ module.exports.dockerSocketHandler = (socket) => {
             let amount = await DockerHost.testDockerHost(dockerHost);
             let msg;
 
-            if (amount > 1) {
+            if (amount >= 1) {
                 msg = "Connected Successfully. Amount of containers: " + amount;
             } else {
                 msg = "Connected Successfully, but there are no containers?";
diff --git a/src/components/DockerHostDialog.vue b/src/components/DockerHostDialog.vue
index 92a8ce455..50ffa49c1 100644
--- a/src/components/DockerHostDialog.vue
+++ b/src/components/DockerHostDialog.vue
@@ -30,7 +30,8 @@
                                 {{ $t("Examples") }}:
                                 <ul>
                                     <li>/var/run/docker.sock</li>
-                                    <li>tcp://localhost:2375</li>
+                                    <li>http://localhost:2375</li>
+                                    <li>https://localhost:2376 (TLS)</li>
                                 </ul>
                             </div>
                         </div>

From 16b2cf0e89ea421aa2640e3c1fa330e6d2f837e4 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Tue, 4 Oct 2022 17:50:11 +0800
Subject: [PATCH 17/30] Update to 1.18.2

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 219042aac..2357bfe4a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "uptime-kuma",
-    "version": "1.18.0",
+    "version": "1.18.2",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -40,7 +40,7 @@
         "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
         "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push",
         "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
-        "setup": "git checkout 1.18.0 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.18.2 && npm ci --production && npm run download-dist",
         "download-dist": "node extra/download-dist.js",
         "mark-as-nightly": "node extra/mark-as-nightly.js",
         "reset-password": "node extra/reset-password.js",

From afbc283423c633240c9628308508c9c32ec69d8b Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Tue, 4 Oct 2022 22:23:57 +0800
Subject: [PATCH 18/30] Move Cypress directory and convert it to JavaScript
 (#2170)

---
 config/cypress.config.js                      | 26 +++++++++++++++++++
 cypress.config.ts                             | 15 -----------
 cypress/e2e/setup.cy.ts                       | 24 -----------------
 cypress/support/actors/actor.ts               |  8 ------
 cypress/support/e2e.ts                        |  1 -
 cypress/support/tasks/setup-task.ts           | 15 -----------
 package.json                                  |  3 ++-
 src/util.js                                   |  6 ++---
 test/cypress/e2e/setup.cy.js                  | 18 +++++++++++++
 {cypress => test/cypress}/plugins/index.js    |  0
 test/cypress/support/actors/actor.js          |  8 ++++++
 .../cypress/support/commands.js               |  0
 .../cypress/support/const/user-data.js        |  2 +-
 test/cypress/support/e2e.js                   |  1 +
 .../cypress/support/pages/dashboard-page.js   |  2 +-
 .../cypress/support/pages/setup-page.js       |  2 +-
 test/cypress/support/tasks/setup-task.js      | 11 ++++++++
 tsconfig.json                                 |  8 +++---
 18 files changed, 75 insertions(+), 75 deletions(-)
 create mode 100644 config/cypress.config.js
 delete mode 100644 cypress.config.ts
 delete mode 100644 cypress/e2e/setup.cy.ts
 delete mode 100644 cypress/support/actors/actor.ts
 delete mode 100644 cypress/support/e2e.ts
 delete mode 100644 cypress/support/tasks/setup-task.ts
 create mode 100644 test/cypress/e2e/setup.cy.js
 rename {cypress => test/cypress}/plugins/index.js (100%)
 create mode 100644 test/cypress/support/actors/actor.js
 rename cypress/support/commands.ts => test/cypress/support/commands.js (100%)
 rename cypress/support/const/user-data.ts => test/cypress/support/const/user-data.js (62%)
 create mode 100644 test/cypress/support/e2e.js
 rename cypress/support/pages/dasboard-page.ts => test/cypress/support/pages/dashboard-page.js (62%)
 rename cypress/support/pages/setup-page.ts => test/cypress/support/pages/setup-page.js (90%)
 create mode 100644 test/cypress/support/tasks/setup-task.js

diff --git a/config/cypress.config.js b/config/cypress.config.js
new file mode 100644
index 000000000..4eeb6845a
--- /dev/null
+++ b/config/cypress.config.js
@@ -0,0 +1,26 @@
+const { defineConfig } = require("cypress");
+
+module.exports = defineConfig({
+    e2e: {
+        setupNodeEvents(on, config) {
+
+        },
+        fixturesFolder: "test/cypress/fixtures",
+        screenshotsFolder: "test/cypress/screenshots",
+        videosFolder: "test/cypress/videos",
+        downloadsFolder: "test/cypress/downloads",
+        supportFile: "test/cypress/support/e2e.js",
+        baseUrl: "http://localhost:3002",
+        defaultCommandTimeout: 10000,
+        pageLoadTimeout: 60000,
+        viewportWidth: 1920,
+        viewportHeight: 1080,
+        specPattern: [
+            "test/cypress/e2e/setup.cy.js",
+            "test/cypress/e2e/**/*.js"
+        ],
+    },
+    env: {
+        baseUrl: "http://localhost:3002",
+    },
+});
diff --git a/cypress.config.ts b/cypress.config.ts
deleted file mode 100644
index d97e08758..000000000
--- a/cypress.config.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { defineConfig } from "cypress";
-
-export default defineConfig({
-    e2e: {
-        baseUrl: "http://localhost:3002",
-        defaultCommandTimeout: 10000,
-        pageLoadTimeout: 60000,
-        viewportWidth: 1920,
-        viewportHeight: 1080,
-        specPattern: ["cypress/e2e/setup.cy.ts", "cypress/e2e/**/*.ts"],
-    },
-    env: {
-        baseUrl: "http://localhost:3002",
-    },
-});
diff --git a/cypress/e2e/setup.cy.ts b/cypress/e2e/setup.cy.ts
deleted file mode 100644
index 94e18edef..000000000
--- a/cypress/e2e/setup.cy.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { actor } from "../support/actors/actor";
-import { DEFAULT_USER_DATA } from "../support/const/user-data";
-import { DashboardPage } from "../support/pages/dasboard-page";
-import { SetupPage } from "../support/pages/setup-page";
-
-describe("user can create a new account on setup page", () => {
-    before(() => {
-        cy.visit("/setup");
-    });
-
-    it("user can create new account", () => {
-        cy.url().should("be.equal", SetupPage.url);
-        actor.setupTask.fillAndSubmitSetupForm(
-            DEFAULT_USER_DATA.username,
-            DEFAULT_USER_DATA.password,
-            DEFAULT_USER_DATA.password
-        );
-
-        cy.url().should("be.equal", DashboardPage.url);
-        cy.get('[role="alert"]')
-            .should("be.visible")
-            .and("contain.text", "Added Successfully.");
-    });
-});
diff --git a/cypress/support/actors/actor.ts b/cypress/support/actors/actor.ts
deleted file mode 100644
index 680c26ce7..000000000
--- a/cypress/support/actors/actor.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { SetupTask } from "../tasks/setup-task";
-
-class Actor {
-    setupTask: SetupTask = new SetupTask();
-}
-
-const actor = new Actor();
-export { actor };
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
deleted file mode 100644
index f887c29ae..000000000
--- a/cypress/support/e2e.ts
+++ /dev/null
@@ -1 +0,0 @@
-import "./commands";
diff --git a/cypress/support/tasks/setup-task.ts b/cypress/support/tasks/setup-task.ts
deleted file mode 100644
index 866e3ca5c..000000000
--- a/cypress/support/tasks/setup-task.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { SetupPage } from "../pages/setup-page";
-
-export class SetupTask {
-    fillAndSubmitSetupForm(
-        username: string,
-        password: string,
-        passwordRepeat: string
-    ) {
-        cy.get(SetupPage.usernameInput).type(username);
-        cy.get(SetupPage.passWordInput).type(password);
-        cy.get(SetupPage.passwordRepeatInput).type(passwordRepeat);
-
-        cy.get(SetupPage.submitSetupForm).click();
-    }
-}
diff --git a/package.json b/package.json
index 2357bfe4a..479876a63 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,8 @@
         "build-dist-and-restart": "npm run build && npm run start-server-dev",
         "start-pr-test": "node extra/checkout-pr.js && npm install && npm run dev",
         "cy:test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --e2e",
-        "cy:run": "npx cypress run --browser chrome --headless"
+        "cy:run": "npx cypress run --browser chrome --headless --config-file ./config/cypress.config.js",
+        "cypress-open": "concurrently -k -r \"node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/\" \"cypress open --config-file ./config/cypress.config.js\""
     },
     "dependencies": {
         "@louislam/sqlite3": "~15.0.6",
diff --git a/src/util.js b/src/util.js
index d5e3617fd..d766feb76 100644
--- a/src/util.js
+++ b/src/util.js
@@ -280,9 +280,9 @@ function getCryptoRandomInt(min, max) {
 }
 exports.getCryptoRandomInt = getCryptoRandomInt;
 /**
- * Generate a secret
- * @param length Lenght of secret to generate
- * @returns
+ * Generate a random alphanumeric string of fixed length
+ * @param length Length of string to generate
+ * @returns string
  */
 function genSecret(length = 64) {
     let secret = "";
diff --git a/test/cypress/e2e/setup.cy.js b/test/cypress/e2e/setup.cy.js
new file mode 100644
index 000000000..579604039
--- /dev/null
+++ b/test/cypress/e2e/setup.cy.js
@@ -0,0 +1,18 @@
+const actor = require("../support/actors/actor");
+const userData = require("../support/const/user-data");
+const dashboardPage = require("../support/pages/dashboard-page");
+const setupPage = require("../support/pages/setup-page");
+
+describe("user can create a new account on setup page", () => {
+    before(() => {
+        cy.visit("/setup");
+    });
+    it("user can create new account", () => {
+        cy.url().should("be.equal", setupPage.SetupPage.url);
+        actor.actor.setupTask.fillAndSubmitSetupForm(userData.DEFAULT_USER_DATA.username, userData.DEFAULT_USER_DATA.password, userData.DEFAULT_USER_DATA.password);
+        cy.url().should("be.equal", dashboardPage.DashboardPage.url);
+        cy.get('[role="alert"]')
+            .should("be.visible")
+            .and("contain.text", "Added Successfully.");
+    });
+});
diff --git a/cypress/plugins/index.js b/test/cypress/plugins/index.js
similarity index 100%
rename from cypress/plugins/index.js
rename to test/cypress/plugins/index.js
diff --git a/test/cypress/support/actors/actor.js b/test/cypress/support/actors/actor.js
new file mode 100644
index 000000000..9775880b8
--- /dev/null
+++ b/test/cypress/support/actors/actor.js
@@ -0,0 +1,8 @@
+const setupTask = require("../tasks/setup-task");
+class Actor {
+    constructor() {
+        this.setupTask = new setupTask.SetupTask();
+    }
+}
+const actor = new Actor();
+exports.actor = actor;
diff --git a/cypress/support/commands.ts b/test/cypress/support/commands.js
similarity index 100%
rename from cypress/support/commands.ts
rename to test/cypress/support/commands.js
diff --git a/cypress/support/const/user-data.ts b/test/cypress/support/const/user-data.js
similarity index 62%
rename from cypress/support/const/user-data.ts
rename to test/cypress/support/const/user-data.js
index ee2264ddd..983597bd6 100644
--- a/cypress/support/const/user-data.ts
+++ b/test/cypress/support/const/user-data.js
@@ -1,4 +1,4 @@
-export const DEFAULT_USER_DATA = {
+exports.DEFAULT_USER_DATA = {
     username: "testuser",
     password: "testuser123",
 };
diff --git a/test/cypress/support/e2e.js b/test/cypress/support/e2e.js
new file mode 100644
index 000000000..449ab857b
--- /dev/null
+++ b/test/cypress/support/e2e.js
@@ -0,0 +1 @@
+require("./commands");
diff --git a/cypress/support/pages/dasboard-page.ts b/test/cypress/support/pages/dashboard-page.js
similarity index 62%
rename from cypress/support/pages/dasboard-page.ts
rename to test/cypress/support/pages/dashboard-page.js
index 48660dc1d..fc2d67e1a 100644
--- a/cypress/support/pages/dasboard-page.ts
+++ b/test/cypress/support/pages/dashboard-page.js
@@ -1,3 +1,3 @@
-export const DashboardPage = {
+exports.DashboardPage = {
     url: Cypress.env("baseUrl") + "/dashboard",
 };
diff --git a/cypress/support/pages/setup-page.ts b/test/cypress/support/pages/setup-page.js
similarity index 90%
rename from cypress/support/pages/setup-page.ts
rename to test/cypress/support/pages/setup-page.js
index 8c1b9cfa3..44a525a85 100644
--- a/cypress/support/pages/setup-page.ts
+++ b/test/cypress/support/pages/setup-page.js
@@ -1,4 +1,4 @@
-export const SetupPage = {
+exports.SetupPage = {
     url: Cypress.env("baseUrl") + "/setup",
     usernameInput: '[data-cy="username-input"]',
     passWordInput: '[data-cy="password-input"]',
diff --git a/test/cypress/support/tasks/setup-task.js b/test/cypress/support/tasks/setup-task.js
new file mode 100644
index 000000000..205f78c23
--- /dev/null
+++ b/test/cypress/support/tasks/setup-task.js
@@ -0,0 +1,11 @@
+const setupPage = require("../pages/setup-page");
+
+class SetupTask {
+    fillAndSubmitSetupForm(username, password, passwordRepeat) {
+        cy.get(setupPage.SetupPage.usernameInput).type(username);
+        cy.get(setupPage.SetupPage.passWordInput).type(password);
+        cy.get(setupPage.SetupPage.passwordRepeatInput).type(passwordRepeat);
+        cy.get(setupPage.SetupPage.submitSetupForm).click();
+    }
+}
+exports.SetupTask = SetupTask;
diff --git a/tsconfig.json b/tsconfig.json
index cd5f7c5dd..c54546424 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,11 +11,9 @@
         "removeComments": false,
         "preserveConstEnums": true,
         "sourceMap": false,
-        "strict": true,
-        "types": ["cypress"]
+        "strict": true
     },
     "files": [
-        "./src/util.ts",
-    ],
-    "include": ["cypress/**/*.ts"]
+        "./src/util.ts"
+    ]
 }

From f1a9046193f014148d6fcdaf53ee53c6a2f4608e Mon Sep 17 00:00:00 2001
From: Sympatron GmbH <35803463+Sympatron@users.noreply.github.com>
Date: Tue, 4 Oct 2022 15:30:19 +0000
Subject: [PATCH 19/30] Prevent terminal window from showing when using ping on
 Windows (#2152)

---
 server/ping-lite.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/ping-lite.js b/server/ping-lite.js
index b7d003b81..05dff31db 100644
--- a/server/ping-lite.js
+++ b/server/ping-lite.js
@@ -105,7 +105,7 @@ Ping.prototype.send = function (callback) {
     let _exited;
     let _errored;
 
-    this._ping = spawn(this._bin, this._args); // spawn the binary
+    this._ping = spawn(this._bin, this._args, { windowsHide: true }); // spawn the binary
 
     this._ping.on("error", function (err) { // handle binary errors
         _errored = true;

From d565320f7422fe4493fc2f22962219780848476e Mon Sep 17 00:00:00 2001
From: Muhammed Hussein karimi <info@karimi.dev>
Date: Wed, 5 Oct 2022 08:23:58 +0330
Subject: [PATCH 20/30] New Demo Server (#2172)

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b81c0be2b..2ebf31a00 100644
--- a/README.md
+++ b/README.md
@@ -15,11 +15,12 @@ It is a self-hosted monitoring tool like "Uptime Robot".
 
 Try it!
 
-https://demo.uptime.kuma.pet
+https://demo.uptime.kuma.pet (Tokyo Server)
+https://demo.uptime-kuma.karimi.dev:27000 (Europe server)
 
-It is a temporary live demo, all data will be deleted after 10 minutes. The server is located in Tokyo, so if you live far from there, it may affect your experience. I suggest that you should install and try it out for the best demo experience.
+It is a temporary live demo, all data will be deleted after 10 minutes. Use the one that is closer to you, but I suggest that you should install and try it out for the best demo experience.
 
-VPS is sponsored by Uptime Kuma sponsors on [Open Collective](https://opencollective.com/uptime-kuma)! Thank you so much!
+Tokyo VPS is sponsored by Uptime Kuma sponsors on [Open Collective](https://opencollective.com/uptime-kuma)! Thank you so much!
 
 ## ⭐ Features
 

From 12696dd53ea1eb5407c46cda05d38ac30603121f Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Wed, 5 Oct 2022 12:54:25 +0800
Subject: [PATCH 21/30] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2ebf31a00..cb81f4dbf 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@ It is a self-hosted monitoring tool like "Uptime Robot".
 
 Try it!
 
-https://demo.uptime.kuma.pet (Tokyo Server)
-https://demo.uptime-kuma.karimi.dev:27000 (Europe server)
+- https://demo.uptime.kuma.pet (Tokyo Server)
+- https://demo.uptime-kuma.karimi.dev:27000 (Europe server)
 
 It is a temporary live demo, all data will be deleted after 10 minutes. Use the one that is closer to you, but I suggest that you should install and try it out for the best demo experience.
 

From e5145a209ac642a36da539dc414f26da75486c52 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Wed, 5 Oct 2022 13:28:13 +0800
Subject: [PATCH 22/30] Update cypress config

---
 config/cypress.config.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/cypress.config.js b/config/cypress.config.js
index 4eeb6845a..26784e882 100644
--- a/config/cypress.config.js
+++ b/config/cypress.config.js
@@ -1,7 +1,9 @@
 const { defineConfig } = require("cypress");
 
 module.exports = defineConfig({
+    projectId: "vyjuem",
     e2e: {
+        experimentalStudio: true,
         setupNodeEvents(on, config) {
 
         },

From 64ba2dce2483eb413ac2c4c1ca6d3e513d8fcafe Mon Sep 17 00:00:00 2001
From: Cyril59310 <70776486+cyril59310@users.noreply.github.com>
Date: Wed, 5 Oct 2022 07:57:38 +0200
Subject: [PATCH 23/30] Update FR language (#2173)

---
 src/languages/fr-FR.js | 120 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 110 insertions(+), 10 deletions(-)

diff --git a/src/languages/fr-FR.js b/src/languages/fr-FR.js
index 10b8c1ba5..22df27280 100644
--- a/src/languages/fr-FR.js
+++ b/src/languages/fr-FR.js
@@ -200,7 +200,7 @@ export default {
     chatIDNotFound: "ID du salon introuvable, envoyez un message via le bot avant",
     webhook: "Webhook",
     "Post URL": "Post URL",
-    "Content Type": "Content Type",
+    "Content Type": "Type de contenu",
     webhookJsonDesc: "{0} est bien/bon pour tous les serveurs HTTP modernes comme express.js",
     webhookFormDataDesc: "{multipart} est bien/bon pour du PHP, vous avez juste besoin de mettre le json via/depuis {decodeFunction}",
     smtp: "Email (SMTP)",
@@ -227,8 +227,8 @@ export default {
     wayToCheckSignalURL: "Vous pouvez regarder l'URL sur comment le mettre en place :",
     signalImportant: "IMPORTANT : Vous ne pouvez pas mixer les groupes et les numéros en destinataires !",
     gotify: "Gotify",
-    "Application Token": "Application Token",
-    "Server URL": "Server URL",
+    "Application Token": "Jeton d'application",
+    "Server URL": "URL du serveur",
     Priority: "Priorité",
     slack: "Slack",
     "Icon Emoji": "Icon Emoji",
@@ -287,7 +287,7 @@ export default {
     promosmsTypeSpeed: "SMS SPEED - La plus haute des priorités dans le système. Très rapide et fiable mais cher (environ le double du prix d'un SMS FULL).",
     promosmsPhoneNumber: "Numéro de téléphone (Poiur les déstinataires Polonais, vous pouvez enlever les codes interna.)",
     promosmsSMSSender: "SMS Expéditeur : Nom pré-enregistré ou l'un de base : InfoSMS, SMS Info, MaxSMS, INFO, SMS",
-    "Primary Base URL": "Primary Base URL",
+    "Primary Base URL": "URL principale",
     emailCustomSubject: "Sujet personalisé",
     clicksendsms: "ClickSend SMS",
     checkPrice: "Vérification {0} tarifs :",
@@ -342,13 +342,13 @@ export default {
     Title: "Titre",
     Content: "Contenu",
     Style: "Style",
-    info: "info",
+    info: "Info",
     warning: "Attention",
-    danger: "danger",
+    danger: "Danger",
     error: "Erreur",
-    critical: "critique",
-    primary: "primaire",
-    light: "blanc",
+    critical: "Critique",
+    primary: "Primaire",
+    light: "Blanc",
     dark: "Noir",
     Post: "Post",
     "Please input title and content": "Veuillez entrer le titre et le contenu",
@@ -390,7 +390,7 @@ export default {
     Installed: "Installé",
     "Not installed": "Pas installé",
     "Remove Token": "Supprimer le jeton",
-    Slug: "chemin",
+    Slug: "Chemin",
     "The slug is already taken. Please choose another slug.": "Le chemin est déjà pris. Veuillez choisir un autre chemin.",
     Authentication: "Authentication",
     "Page Not Found": "Page non trouvée",
@@ -431,4 +431,104 @@ export default {
     "Trigger type:": "Type de déclencheur:",
     "Event type:": "Type d'événement:",
     "Event data:": "Données d'événement:",
+    topic: "Topic",
+    topicExplanation: "MQTT sujet à surveiller",
+    successMessage: "Message de réussite",
+    successMessageExplanation: "MQTT message qui sera considéré comme un succès",
+    "Powered by": "Propulsé par",
+    serwersms: "SerwerSMS.pl",
+    stackfield: "Stackfield",
+    smtpDkimSettings: "Paramètres DKIM",
+    smtpDkimDesc: "Veuillez vous référer au Nodemailer DKIM {0} pour l'utilisation.",
+    documentation: "Documentation",
+    smtpDkimDomain: "Nom de domaine",
+    smtpDkimKeySelector: "Sélecteur de clé",
+    smtpDkimPrivateKey: "Clé privée",
+    smtpDkimHashAlgo: "Algorithme de hachage (facultatif)",
+    smtpDkimheaderFieldNames: "Clés d'en-tête à signer (facultatif)",
+    smtpDkimskipFields: "Clés d'en-tête à ne pas signer (facultatif)",
+    wayToGetPagerDutyKey: "Vous pouvez l'obtenir en allant dans Service -> Annuaire des services -> (Sélectionner un service) -> Intégrations -> Ajouter une intégration. Ici, vous pouvez rechercher \"Events API V2\". Plus d'infos {0}",
+    "Integration Key": "Clé d'intégration",
+    "Integration URL": "URL d'intégration",
+    "Auto resolve or acknowledged": "Résolution automatique ou accusé de réception",
+    "do nothing": "ne fais rien",
+    "auto acknowledged": "accusé de réception automatique",
+    "auto resolve": "résolution automatique",
+    AccessKeyId: "ID de clé d'accès",
+    SecretAccessKey: "Clé secrète d'accès",
+    PhoneNumbers: "Les numéros de téléphone",
+    SignName: "Signature",
+    "Sms template must contain parameters: ": "Le modèle de SMS doit contenir des paramètres : ",
+    SecretKey: "Clé secrète",
+    "For safety, must use secret key": "Pour la sécurité, doit utiliser la clé secrète",
+    "Device Token": "Jeton d'appareil",
+    Platform: "Plateforme",
+    Retry: "Recommencez",
+    Topic: "Topic",
+    "Proxy server has authentication": "Le serveur proxy a une authentification",
+    Running: "Fonctionne",
+    "Not running": "Ne fonctionne pas",
+    Start: "Start",
+    Stop: "Stop",
+    "Uptime Kuma": "Uptime Kuma",
+    "No Proxy": "Pas de Proxy",
+    "HTTP Basic Auth": "Authentification de base HTTP",
+    "Reverse Proxy": "Proxy inverse",
+    wayToGetCloudflaredURL: "(Télécharger cloudflared depuis {0})",
+    cloudflareWebsite: "le site Cloudflare ",
+    "Message:": "Message:",
+    "Don't know how to get the token? Please read the guide:": "Vous ne savez pas comment obtenir le jeton ? Veuillez lire le guide:",
+    "The current connection may be lost if you are currently connecting via Cloudflare Tunnel. Are you sure want to stop it? Type your current password to confirm it.": "La connexion actuelle peut être perdue si vous vous connectez actuellement via Cloudflare Tunnel. Êtes-vous sûr de vouloir l'arrêter ? Tapez votre mot de passe actuel pour le confirmer.",
+    "HTTP Headers": "En-têtes HTTP",
+    "Trust Proxy": "Proxy de confiance",
+    "Other Software": "Autres logiciels",
+    "For example: nginx, Apache and Traefik.": "Par exemple : nginx, Apache et Traefik.",
+    "Please read": "S'il vous plaît Lisez",
+    "Valid To:": "Valable pour:",
+    "Days Remaining:": "Jours restant:",
+    "Domain Name Expiry Notification": "Notification d'expiration de nom de domaine",
+    "Date Created": "Date de création",
+    HomeAssistant: "Home Assistant",
+    onebotHttpAddress: "Adresse HTTP OneBot",
+    onebotMessageType: "Type de message OneBot",
+    onebotGroupMessage: "Groupe",
+    onebotUserOrGroupId: "ID de groupe/utilisateur",
+    onebotSafetyTips: "Pour des raisons de sécurité, vous devez définir un jeton d'accès",
+    "PushDeer Key": "Clé PushDeer",
+    "Show Powered By": "Afficher \"Propulsé par\"",
+    RadiusSecretDescription: "Secret partagé entre le client et le serveur",
+    RadiusCalledStationId: "Identifiant de la station appelée",
+    RadiusCalledStationIdDescription: "Identifiant de l'appareil appelé",
+    RadiusCallingStationId: "Identifiant de la station appelante",
+    RadiusCallingStationIdDescription: "Identifiant de l'appareil appelant",
+    "Certificate Expiry Notification": "Notification d'expiration du certificat",
+    "API Username": "Nom d'utilisateur de l'API",
+    "API Key": "clé API",
+    "Recipient Number": "Numéro du destinataire",
+    "From Name/Number": "De Nom/Numéro",
+    "Leave blank to use a shared sender number.": "Laisser vide pour utiliser un numéro d'expéditeur partagé.",
+    "Octopush API Version": "Version de l'API Octopush",
+    octopushAPIKey: "\"Clé API\" à partir des informations d'identification de l'API HTTP dans le panneau de configuration",
+    octopushLogin: "\"Connexion\" à partir des informations d'identification de l'API HTTP dans le panneau de configuration",
+    "Using a Reverse Proxy?": "Utiliser un proxy inverse ?",
+    "Check how to config it for WebSocket": "Vérifiez comment le configurer pour WebSocket",
+    wayToGetClickSendSMSToken: "Vous pouvez obtenir le nom d'utilisateur API et la clé API à partir de {0} .",
+    "Connection String": "Chaîne de connexion",
+    Query: "Requête",
+    tcp: "TCP / HTTP",
+    "Docker Container": "Conteneur Docker",
+    Workstation: "Poste de travail",
+    disableCloudflaredNoAuthMsg: "Vous êtes en mode No Auth, un mot de passe n'est pas nécessaire.",
+    "Long-Lived Access Token": "Jeton d'accès de longue durée",
+    "Then choose an action, for example switch the scene to where an RGB light is red.": "Ensuite, choisissez une action, par exemple basculer la scène là où une lumière RVB est rouge.",
+    "Frontend Version": "Frontend Version",
+    "Frontend Version do not match backend version!": "La version frontale ne correspond pas à la version principale !",
+    "Base URL": "URL de base",
+    goAlertInfo: "GoAlert est une application open source pour la planification des appels, les escalades automatisées et les notifications (comme les SMS ou les appels vocaux). Engagez automatiquement la bonne personne, de la bonne manière et au bon moment ! {0}",
+    goAlertIntegrationKeyInfo: "Obtenez la clé d'intégration d'API générique pour le service dans ce format \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" généralement la valeur du paramètre de jeton de l'URL copiée.",
+    goAlert: "GoAlert",
+    backupOutdatedWarning: "Obsolète : étant donné que de nombreuses fonctionnalités ont été ajoutées et que cette fonctionnalité de sauvegarde est un peu non maintenue, elle ne peut pas générer ou restaurer une sauvegarde complète.",
+    backupRecommend: "Veuillez sauvegarder le volume ou le dossier de données (./data/) directement à la place.",
+    Optional: "Optionnel",
+    squadcast: "Squadcast",
 };

From a5c102e750f49b510fbf229bb97ce338fadad1f3 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Wed, 5 Oct 2022 14:19:50 +0800
Subject: [PATCH 24/30] Update README.md

---
 README.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index cb81f4dbf..55a6ec504 100644
--- a/README.md
+++ b/README.md
@@ -15,13 +15,11 @@ It is a self-hosted monitoring tool like "Uptime Robot".
 
 Try it!
 
-- https://demo.uptime.kuma.pet (Tokyo Server)
-- https://demo.uptime-kuma.karimi.dev:27000 (Europe server)
+- Tokyo Demo Server: https://demo.uptime.kuma.pet (Sponsored by [Uptime Kuma Sponsors](https://github.com/louislam/uptime-kuma#%EF%B8%8F-sponsors))
+- Europe Demo Server: https://demo.uptime-kuma.karimi.dev:27000 (Provided by [@mhkarimi1383](https://github.com/mhkarimi1383))
 
 It is a temporary live demo, all data will be deleted after 10 minutes. Use the one that is closer to you, but I suggest that you should install and try it out for the best demo experience.
 
-Tokyo VPS is sponsored by Uptime Kuma sponsors on [Open Collective](https://opencollective.com/uptime-kuma)! Thank you so much!
-
 ## ⭐ Features
 
 * Monitoring uptime for HTTP(s) / TCP / HTTP(s) Keyword / Ping / DNS Record / Push / Steam Game Server / Docker Containers.

From b993859926566efc31ed962029d857e04a58d493 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Wed, 5 Oct 2022 14:26:30 +0800
Subject: [PATCH 25/30] Drop Jest e2e testing (#2174)

---
 config/jest-debug-env.js        |   33 -
 config/jest-frontend.config.js  |    5 -
 config/jest-puppeteer.config.js |   20 -
 config/jest.config.js           |   12 -
 package-lock.json               | 1367 +------------------------------
 package.json                    |    4 -
 server/util-server.js           |    2 +-
 test/e2e.spec.js                |  329 --------
 test/frontend.spec.js           |   42 -
 test/prepare-jest.js            |   10 -
 10 files changed, 3 insertions(+), 1821 deletions(-)
 delete mode 100644 config/jest-debug-env.js
 delete mode 100644 config/jest-frontend.config.js
 delete mode 100644 config/jest-puppeteer.config.js
 delete mode 100644 config/jest.config.js
 delete mode 100644 test/e2e.spec.js
 delete mode 100644 test/frontend.spec.js
 delete mode 100644 test/prepare-jest.js

diff --git a/config/jest-debug-env.js b/config/jest-debug-env.js
deleted file mode 100644
index 74f6d7835..000000000
--- a/config/jest-debug-env.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const PuppeteerEnvironment = require("jest-environment-puppeteer");
-const util = require("util");
-
-class DebugEnv extends PuppeteerEnvironment {
-    async handleTestEvent(event, state) {
-        const ignoredEvents = [
-            "setup",
-            "add_hook",
-            "start_describe_definition",
-            "add_test",
-            "finish_describe_definition",
-            "run_start",
-            "run_describe_start",
-            "test_start",
-            "hook_start",
-            "hook_success",
-            "test_fn_start",
-            "test_fn_success",
-            "test_done",
-            "run_describe_finish",
-            "run_finish",
-            "teardown",
-            "test_fn_failure",
-        ];
-        if (!ignoredEvents.includes(event.name)) {
-            console.log(
-                new Date().toString() + ` Unhandled event [${event.name}] ` + util.inspect(event)
-            );
-        }
-    }
-}
-
-module.exports = DebugEnv;
diff --git a/config/jest-frontend.config.js b/config/jest-frontend.config.js
deleted file mode 100644
index ab6af7f1e..000000000
--- a/config/jest-frontend.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-    "rootDir": "..",
-    "testRegex": "./test/frontend.spec.js",
-};
-
diff --git a/config/jest-puppeteer.config.js b/config/jest-puppeteer.config.js
deleted file mode 100644
index dc4f7b344..000000000
--- a/config/jest-puppeteer.config.js
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = {
-    "launch": {
-        "dumpio": true,
-        "slowMo": 500,
-        "headless": process.env.HEADLESS_TEST || false,
-        "userDataDir": "./data/test-chrome-profile",
-        args: [
-            "--disable-setuid-sandbox",
-            "--disable-gpu",
-            "--disable-dev-shm-usage",
-            "--no-default-browser-check",
-            "--no-experiments",
-            "--no-first-run",
-            "--no-pings",
-            "--no-sandbox",
-            "--no-zygote",
-            "--single-process",
-        ],
-    }
-};
diff --git a/config/jest.config.js b/config/jest.config.js
deleted file mode 100644
index 2d3f585ef..000000000
--- a/config/jest.config.js
+++ /dev/null
@@ -1,12 +0,0 @@
-module.exports = {
-    "verbose": true,
-    "preset": "jest-puppeteer",
-    "globals": {
-        "__DEV__": true
-    },
-    "testRegex": "./test/e2e.spec.js",
-    "testEnvironment": "./config/jest-debug-env.js",
-    "rootDir": "..",
-    "testTimeout": 30000,
-};
-
diff --git a/package-lock.json b/package-lock.json
index 65e380d1a..718270427 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "uptime-kuma",
-    "version": "1.18.0",
+    "version": "1.18.2",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "uptime-kuma",
-            "version": "1.18.0",
+            "version": "1.18.2",
             "license": "MIT",
             "dependencies": {
                 "@louislam/sqlite3": "~15.0.6",
@@ -83,12 +83,10 @@
                 "eslint-plugin-vue": "~8.7.1",
                 "favico.js": "^0.3.10",
                 "jest": "~27.2.5",
-                "jest-puppeteer": "~6.0.3",
                 "postcss-html": "~1.5.0",
                 "postcss-rtlcss": "~3.7.2",
                 "postcss-scss": "~4.0.4",
                 "prismjs": "^1.27.0",
-                "puppeteer": "~13.1.3",
                 "qrcode": "~1.5.0",
                 "rollup-plugin-visualizer": "^5.6.0",
                 "sass": "~1.42.1",
@@ -4231,15 +4229,6 @@
             "resolved": "https://registry.npmjs.org/args-parser/-/args-parser-1.3.0.tgz",
             "integrity": "sha512-If3Zi4BSjlQIJ9fgAhSiKi0oJtgMzSqh0H4wvl7XSeO16FKx7QqaHld8lZeEajPX7y1C5qKKeNgyrfyvmjmjUQ=="
         },
-        "node_modules/arr-union": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-            "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/array-flatten": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -5317,34 +5306,6 @@
                 "wrap-ansi": "^7.0.0"
             }
         },
-        "node_modules/clone-deep": {
-            "version": "0.2.4",
-            "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
-            "integrity": "sha512-we+NuQo2DHhSl+DP6jlUiAhyAjBQrYnpOk15rN6c6JSPScjiCLh8IbSU+VTcph6YS3o7mASE8a0+gbZ7ChLpgg==",
-            "dev": true,
-            "dependencies": {
-                "for-own": "^0.1.3",
-                "is-plain-object": "^2.0.1",
-                "kind-of": "^3.0.2",
-                "lazy-cache": "^1.0.3",
-                "shallow-clone": "^0.1.2"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/clone-deep/node_modules/is-plain-object": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-            "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-            "dev": true,
-            "dependencies": {
-                "isobject": "^3.0.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/clone-regexp": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
@@ -5935,19 +5896,6 @@
             "resolved": "https://registry.npmjs.org/custom-error-instance/-/custom-error-instance-2.1.1.tgz",
             "integrity": "sha512-p6JFxJc3M4OTD2li2qaHkDCw9SfMw82Ldr6OC9Je1aXiGfhx2W8p3GaoeaGrPJTUN9NirTM/KTxHWMUdR1rsUg=="
         },
-        "node_modules/cwd": {
-            "version": "0.10.0",
-            "resolved": "https://registry.npmjs.org/cwd/-/cwd-0.10.0.tgz",
-            "integrity": "sha512-YGZxdTTL9lmLkCUTpg4j0zQ7IhRB5ZmqNBbGCl3Tg6MP/d5/6sY7L5mmTjzbc6JKgVZYiqTQTNhPFsbXNGlRaA==",
-            "dev": true,
-            "dependencies": {
-                "find-pkg": "^0.1.2",
-                "fs-exists-sync": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=0.8"
-            }
-        },
         "node_modules/cypress": {
             "version": "10.7.0",
             "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.7.0.tgz",
@@ -6400,12 +6348,6 @@
             "resolved": "https://registry.npmjs.org/dev-null/-/dev-null-0.1.1.tgz",
             "integrity": "sha512-nMNZG0zfMgmdv8S5O0TM5cpwNbGKRGPCxVsr0SmA3NZZy9CYBbuNLL0PD3Acx9e5LIUgwONXtM9kM6RlawPxEQ=="
         },
-        "node_modules/devtools-protocol": {
-            "version": "0.0.948846",
-            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.948846.tgz",
-            "integrity": "sha512-5fGyt9xmMqUl2VI7+rnUkKCiAQIpLns8sfQtTENy5L70ktbNw0Z3TFJ1JoFNYdx/jffz4YXU45VF75wKZD7sZQ==",
-            "dev": true
-        },
         "node_modules/diff-sequences": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
@@ -7717,18 +7659,6 @@
                 "node": ">= 0.8.0"
             }
         },
-        "node_modules/expand-tilde": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
-            "integrity": "sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q==",
-            "dev": true,
-            "dependencies": {
-                "os-homedir": "^1.0.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/expect": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
@@ -7744,12 +7674,6 @@
                 "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
             }
         },
-        "node_modules/expect-puppeteer": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/expect-puppeteer/-/expect-puppeteer-6.1.1.tgz",
-            "integrity": "sha512-cnQF96qdoEcOD63j5NQMc0RtW9WRMW/WHKXEKsuDQ2tszhVH3qC7zkXXS4D0LTt9qCB3DEExioqylsQXvqPrUw==",
-            "dev": true
-        },
         "node_modules/express": {
             "version": "4.17.3",
             "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
@@ -8073,115 +7997,6 @@
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
             "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         },
-        "node_modules/find-file-up": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/find-file-up/-/find-file-up-0.1.3.tgz",
-            "integrity": "sha512-mBxmNbVyjg1LQIIpgO8hN+ybWBgDQK8qjht+EbrTCGmmPV/sc7RF1i9stPTD6bpvXZywBdrwRYxhSdJv867L6A==",
-            "dev": true,
-            "dependencies": {
-                "fs-exists-sync": "^0.1.0",
-                "resolve-dir": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/find-pkg": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/find-pkg/-/find-pkg-0.1.2.tgz",
-            "integrity": "sha512-0rnQWcFwZr7eO0513HahrWafsc3CTFioEB7DRiEYCUM/70QXSY8f3mCST17HXLcPvEhzH/Ty/Bxd72ZZsr/yvw==",
-            "dev": true,
-            "dependencies": {
-                "find-file-up": "^0.1.2"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/find-process": {
-            "version": "1.4.7",
-            "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz",
-            "integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==",
-            "dev": true,
-            "dependencies": {
-                "chalk": "^4.0.0",
-                "commander": "^5.1.0",
-                "debug": "^4.1.1"
-            },
-            "bin": {
-                "find-process": "bin/find-process.js"
-            }
-        },
-        "node_modules/find-process/node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/find-process/node_modules/chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/chalk?sponsor=1"
-            }
-        },
-        "node_modules/find-process/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/find-process/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
-        "node_modules/find-process/node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/find-process/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/find-up": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -8233,27 +8048,6 @@
                 }
             }
         },
-        "node_modules/for-in": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-            "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/for-own": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-            "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
-            "dev": true,
-            "dependencies": {
-                "for-in": "^1.0.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/forever-agent": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -8326,21 +8120,6 @@
                 "safe-buffer": "~5.1.0"
             }
         },
-        "node_modules/fs-constants": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-            "dev": true
-        },
-        "node_modules/fs-exists-sync": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
-            "integrity": "sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/fs-extra": {
             "version": "10.1.0",
             "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
@@ -8606,46 +8385,6 @@
                 "node": ">=10"
             }
         },
-        "node_modules/global-modules": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
-            "integrity": "sha512-JeXuCbvYzYXcwE6acL9V2bAOeSIGl4dD+iwLY9iUx2VBJJ80R18HCn+JCwHM9Oegdfya3lEkGCdaRkSyc10hDA==",
-            "dev": true,
-            "dependencies": {
-                "global-prefix": "^0.1.4",
-                "is-windows": "^0.2.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/global-prefix": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
-            "integrity": "sha512-gOPiyxcD9dJGCEArAhF4Hd0BAqvAe/JzERP7tYumE4yIkmIedPUVXcJFWbV3/p/ovIIvKjkrTk+f1UVkq7vvbw==",
-            "dev": true,
-            "dependencies": {
-                "homedir-polyfill": "^1.0.0",
-                "ini": "^1.3.4",
-                "is-windows": "^0.2.0",
-                "which": "^1.2.12"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/global-prefix/node_modules/which": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-            "dev": true,
-            "dependencies": {
-                "isexe": "^2.0.0"
-            },
-            "bin": {
-                "which": "bin/which"
-            }
-        },
         "node_modules/globals": {
             "version": "11.12.0",
             "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -8822,18 +8561,6 @@
             "integrity": "sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==",
             "deprecated": "This module has moved and is now available at @hapi/hoek. Please update your dependencies as this version is no longer maintained an may contain bugs and security issues."
         },
-        "node_modules/homedir-polyfill": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-            "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-            "dev": true,
-            "dependencies": {
-                "parse-passwd": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/hosted-git-info": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
@@ -9186,12 +8913,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/is-buffer": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-            "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-            "dev": true
-        },
         "node_modules/is-callable": {
             "version": "1.2.4",
             "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
@@ -9254,15 +8975,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/is-extendable": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-            "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/is-extglob": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -9545,15 +9257,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/is-windows": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
-            "integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/is-wsl": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
@@ -9588,15 +9291,6 @@
             "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
             "devOptional": true
         },
-        "node_modules/isobject": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-            "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/isstream": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
@@ -10064,91 +9758,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/jest-dev-server": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-6.1.1.tgz",
-            "integrity": "sha512-z5LnaGDvlIkdMv/rppSO4+rq+GyQKf1xI9oiBxf9/2EBeN2hxRaWiMvaLNDnHPZj2PAhBXsycrKslDDoZO2Xtw==",
-            "dev": true,
-            "dependencies": {
-                "chalk": "^4.1.2",
-                "cwd": "^0.10.0",
-                "find-process": "^1.4.7",
-                "prompts": "^2.4.2",
-                "spawnd": "^6.0.2",
-                "tree-kill": "^1.2.2",
-                "wait-on": "^6.0.1"
-            }
-        },
-        "node_modules/jest-dev-server/node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/jest-dev-server/node_modules/chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/chalk?sponsor=1"
-            }
-        },
-        "node_modules/jest-dev-server/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-dev-server/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
-        "node_modules/jest-dev-server/node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/jest-dev-server/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/jest-diff": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
@@ -10367,89 +9976,6 @@
                 "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
             }
         },
-        "node_modules/jest-environment-puppeteer": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/jest-environment-puppeteer/-/jest-environment-puppeteer-6.1.1.tgz",
-            "integrity": "sha512-Ces37g8Gdj7QaVxszeoXlvmsZxcEJN9EPUdJt8fGMLA+6ARVFKyVmFgP9xVeGyjTvzsXdtIiJdeOKMLMeD8r2A==",
-            "dev": true,
-            "dependencies": {
-                "chalk": "^4.1.2",
-                "cwd": "^0.10.0",
-                "jest-dev-server": "^6.1.1",
-                "jest-environment-node": "^27.4.4",
-                "merge-deep": "^3.0.3"
-            }
-        },
-        "node_modules/jest-environment-puppeteer/node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/jest-environment-puppeteer/node_modules/chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/chalk?sponsor=1"
-            }
-        },
-        "node_modules/jest-environment-puppeteer/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-environment-puppeteer/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
-        "node_modules/jest-environment-puppeteer/node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/jest-environment-puppeteer/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/jest-get-type": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
@@ -10801,19 +10327,6 @@
                 }
             }
         },
-        "node_modules/jest-puppeteer": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/jest-puppeteer/-/jest-puppeteer-6.0.3.tgz",
-            "integrity": "sha512-6GRdbkWwNu8dfzo4icpwc50+K5ECYpWyD9sxpRa03PA8Hi3byl0dcAx+NjCivSezWjAl2Iwwhujqb+bczei0Bg==",
-            "dev": true,
-            "dependencies": {
-                "expect-puppeteer": "^6.0.2",
-                "jest-environment-puppeteer": "^6.0.3"
-            },
-            "peerDependencies": {
-                "puppeteer": ">= 1.5.0"
-            }
-        },
         "node_modules/jest-regex-util": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
@@ -11863,18 +11376,6 @@
             "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
             "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
         },
-        "node_modules/kind-of": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-            "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-            "dev": true,
-            "dependencies": {
-                "is-buffer": "^1.1.5"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/kleur": {
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -11982,15 +11483,6 @@
                 "node": "> 0.8"
             }
         },
-        "node_modules/lazy-cache": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-            "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/leven": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -12454,20 +11946,6 @@
             "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==",
             "dev": true
         },
-        "node_modules/merge-deep": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz",
-            "integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==",
-            "dev": true,
-            "dependencies": {
-                "arr-union": "^3.1.0",
-                "clone-deep": "^0.2.4",
-                "kind-of": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/merge-descriptors": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -12619,28 +12097,6 @@
                 "node": ">= 8"
             }
         },
-        "node_modules/mixin-object": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
-            "integrity": "sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==",
-            "dev": true,
-            "dependencies": {
-                "for-in": "^0.1.3",
-                "is-extendable": "^0.1.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/mixin-object/node_modules/for-in": {
-            "version": "0.1.8",
-            "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-            "integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/mkdirp": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -12652,12 +12108,6 @@
                 "node": ">=10"
             }
         },
-        "node_modules/mkdirp-classic": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-            "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-            "dev": true
-        },
         "node_modules/mqemitter": {
             "version": "4.5.0",
             "resolved": "https://registry.npmjs.org/mqemitter/-/mqemitter-4.5.0.tgz",
@@ -13292,15 +12742,6 @@
                 "node": ">= 0.8.0"
             }
         },
-        "node_modules/os-homedir": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-            "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/ospath": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz",
@@ -13426,15 +12867,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/parse-passwd": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-            "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/parse5": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.0.0.tgz",
@@ -13910,15 +13342,6 @@
             "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
             "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
         },
-        "node_modules/progress": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
         "node_modules/prom-client": {
             "version": "13.2.0",
             "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-13.2.0.tgz",
@@ -13984,12 +13407,6 @@
                 "node": ">= 0.10"
             }
         },
-        "node_modules/proxy-from-env": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-            "dev": true
-        },
         "node_modules/psl": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
@@ -14013,87 +13430,6 @@
                 "node": ">=6"
             }
         },
-        "node_modules/puppeteer": {
-            "version": "13.1.3",
-            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-13.1.3.tgz",
-            "integrity": "sha512-nqcJNThLUG0Dgo++2mMtGR2FCyg7olJJhj/rm0A65muyN3nrH6lGvnNRzEaNmSnHWvjaDIG9ox5kxQB+nXTg5A==",
-            "dev": true,
-            "hasInstallScript": true,
-            "dependencies": {
-                "debug": "4.3.2",
-                "devtools-protocol": "0.0.948846",
-                "extract-zip": "2.0.1",
-                "https-proxy-agent": "5.0.0",
-                "node-fetch": "2.6.7",
-                "pkg-dir": "4.2.0",
-                "progress": "2.0.3",
-                "proxy-from-env": "1.1.0",
-                "rimraf": "3.0.2",
-                "tar-fs": "2.1.1",
-                "unbzip2-stream": "1.4.3",
-                "ws": "8.2.3"
-            },
-            "engines": {
-                "node": ">=10.18.1"
-            }
-        },
-        "node_modules/puppeteer/node_modules/debug": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-            "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-            "dev": true,
-            "dependencies": {
-                "ms": "2.1.2"
-            },
-            "engines": {
-                "node": ">=6.0"
-            },
-            "peerDependenciesMeta": {
-                "supports-color": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/puppeteer/node_modules/https-proxy-agent": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-            "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-            "dev": true,
-            "dependencies": {
-                "agent-base": "6",
-                "debug": "4"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/puppeteer/node_modules/ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-            "dev": true
-        },
-        "node_modules/puppeteer/node_modules/ws": {
-            "version": "8.2.3",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-            "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
-            "dev": true,
-            "engines": {
-                "node": ">=10.0.0"
-            },
-            "peerDependencies": {
-                "bufferutil": "^4.0.1",
-                "utf-8-validate": "^5.0.2"
-            },
-            "peerDependenciesMeta": {
-                "bufferutil": {
-                    "optional": true
-                },
-                "utf-8-validate": {
-                    "optional": true
-                }
-            }
-        },
         "node_modules/qlobber": {
             "version": "5.0.3",
             "resolved": "https://registry.npmjs.org/qlobber/-/qlobber-5.0.3.tgz",
@@ -14728,19 +14064,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/resolve-dir": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
-            "integrity": "sha512-QxMPqI6le2u0dCLyiGzgy92kjkkL6zO0XyvHzjdTNH3zM6e5Hz3BwG6+aEyNgiQ5Xz6PwTwgQEj3U50dByPKIA==",
-            "dev": true,
-            "dependencies": {
-                "expand-tilde": "^1.2.2",
-                "global-modules": "^0.2.3"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/resolve-from": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -15070,42 +14393,6 @@
             "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
             "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
         },
-        "node_modules/shallow-clone": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
-            "integrity": "sha512-J1zdXCky5GmNnuauESROVu31MQSnLoYvlyEn6j2Ztk6Q5EHFIhxkMhYcv6vuDzl2XEzoRr856QwzMgWM/TmZgw==",
-            "dev": true,
-            "dependencies": {
-                "is-extendable": "^0.1.1",
-                "kind-of": "^2.0.1",
-                "lazy-cache": "^0.2.3",
-                "mixin-object": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/shallow-clone/node_modules/kind-of": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-            "integrity": "sha512-0u8i1NZ/mg0b+W3MGGw5I7+6Eib2nx72S/QvXa0hYjEkjTknYmEYQJwGu3mLC0BrhtJjtQafTkyRUQ75Kx0LVg==",
-            "dev": true,
-            "dependencies": {
-                "is-buffer": "^1.0.2"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/shallow-clone/node_modules/lazy-cache": {
-            "version": "0.2.7",
-            "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
-            "integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/shebang-command": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -15359,17 +14646,6 @@
             "integrity": "sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==",
             "dev": true
         },
-        "node_modules/spawnd": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/spawnd/-/spawnd-6.0.2.tgz",
-            "integrity": "sha512-+YJtx0dvy2wt304MrHD//tASc84zinBUYU1jacPBzrjhZUd7RsDo25krxr4HUHAQzEQFuMAs4/p+yLYU5ciZ1w==",
-            "dev": true,
-            "dependencies": {
-                "exit": "^0.1.2",
-                "signal-exit": "^3.0.6",
-                "tree-kill": "^1.2.2"
-            }
-        },
         "node_modules/spdx-correct": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
@@ -15914,40 +15190,6 @@
                 "node": ">= 10"
             }
         },
-        "node_modules/tar-fs": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-            "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-            "dev": true,
-            "dependencies": {
-                "chownr": "^1.1.1",
-                "mkdirp-classic": "^0.5.2",
-                "pump": "^3.0.0",
-                "tar-stream": "^2.1.4"
-            }
-        },
-        "node_modules/tar-fs/node_modules/chownr": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-            "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-            "dev": true
-        },
-        "node_modules/tar-stream": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-            "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-            "dev": true,
-            "dependencies": {
-                "bl": "^4.0.3",
-                "end-of-stream": "^1.4.1",
-                "fs-constants": "^1.0.0",
-                "inherits": "^2.0.3",
-                "readable-stream": "^3.1.1"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
         "node_modules/tarn": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/tarn/-/tarn-3.0.2.tgz",
@@ -16349,16 +15591,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/unbzip2-stream": {
-            "version": "1.4.3",
-            "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-            "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-            "dev": true,
-            "dependencies": {
-                "buffer": "^5.2.1",
-                "through": "^2.3.8"
-            }
-        },
         "node_modules/unicode-canonical-property-names-ecmascript": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -20628,12 +19860,6 @@
             "resolved": "https://registry.npmjs.org/args-parser/-/args-parser-1.3.0.tgz",
             "integrity": "sha512-If3Zi4BSjlQIJ9fgAhSiKi0oJtgMzSqh0H4wvl7XSeO16FKx7QqaHld8lZeEajPX7y1C5qKKeNgyrfyvmjmjUQ=="
         },
-        "arr-union": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-            "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-            "dev": true
-        },
         "array-flatten": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -21462,30 +20688,6 @@
                 "wrap-ansi": "^7.0.0"
             }
         },
-        "clone-deep": {
-            "version": "0.2.4",
-            "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
-            "integrity": "sha512-we+NuQo2DHhSl+DP6jlUiAhyAjBQrYnpOk15rN6c6JSPScjiCLh8IbSU+VTcph6YS3o7mASE8a0+gbZ7ChLpgg==",
-            "dev": true,
-            "requires": {
-                "for-own": "^0.1.3",
-                "is-plain-object": "^2.0.1",
-                "kind-of": "^3.0.2",
-                "lazy-cache": "^1.0.3",
-                "shallow-clone": "^0.1.2"
-            },
-            "dependencies": {
-                "is-plain-object": {
-                    "version": "2.0.4",
-                    "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-                    "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-                    "dev": true,
-                    "requires": {
-                        "isobject": "^3.0.1"
-                    }
-                }
-            }
-        },
         "clone-regexp": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
@@ -21950,16 +21152,6 @@
             "resolved": "https://registry.npmjs.org/custom-error-instance/-/custom-error-instance-2.1.1.tgz",
             "integrity": "sha512-p6JFxJc3M4OTD2li2qaHkDCw9SfMw82Ldr6OC9Je1aXiGfhx2W8p3GaoeaGrPJTUN9NirTM/KTxHWMUdR1rsUg=="
         },
-        "cwd": {
-            "version": "0.10.0",
-            "resolved": "https://registry.npmjs.org/cwd/-/cwd-0.10.0.tgz",
-            "integrity": "sha512-YGZxdTTL9lmLkCUTpg4j0zQ7IhRB5ZmqNBbGCl3Tg6MP/d5/6sY7L5mmTjzbc6JKgVZYiqTQTNhPFsbXNGlRaA==",
-            "dev": true,
-            "requires": {
-                "find-pkg": "^0.1.2",
-                "fs-exists-sync": "^0.1.0"
-            }
-        },
         "cypress": {
             "version": "10.7.0",
             "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.7.0.tgz",
@@ -22299,12 +21491,6 @@
             "resolved": "https://registry.npmjs.org/dev-null/-/dev-null-0.1.1.tgz",
             "integrity": "sha512-nMNZG0zfMgmdv8S5O0TM5cpwNbGKRGPCxVsr0SmA3NZZy9CYBbuNLL0PD3Acx9e5LIUgwONXtM9kM6RlawPxEQ=="
         },
-        "devtools-protocol": {
-            "version": "0.0.948846",
-            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.948846.tgz",
-            "integrity": "sha512-5fGyt9xmMqUl2VI7+rnUkKCiAQIpLns8sfQtTENy5L70ktbNw0Z3TFJ1JoFNYdx/jffz4YXU45VF75wKZD7sZQ==",
-            "dev": true
-        },
         "diff-sequences": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
@@ -23167,15 +22353,6 @@
             "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
             "dev": true
         },
-        "expand-tilde": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
-            "integrity": "sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q==",
-            "dev": true,
-            "requires": {
-                "os-homedir": "^1.0.1"
-            }
-        },
         "expect": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
@@ -23188,12 +22365,6 @@
                 "jest-message-util": "^27.5.1"
             }
         },
-        "expect-puppeteer": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/expect-puppeteer/-/expect-puppeteer-6.1.1.tgz",
-            "integrity": "sha512-cnQF96qdoEcOD63j5NQMc0RtW9WRMW/WHKXEKsuDQ2tszhVH3qC7zkXXS4D0LTt9qCB3DEExioqylsQXvqPrUw==",
-            "dev": true
-        },
         "express": {
             "version": "4.17.3",
             "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
@@ -23464,87 +22635,6 @@
                 }
             }
         },
-        "find-file-up": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/find-file-up/-/find-file-up-0.1.3.tgz",
-            "integrity": "sha512-mBxmNbVyjg1LQIIpgO8hN+ybWBgDQK8qjht+EbrTCGmmPV/sc7RF1i9stPTD6bpvXZywBdrwRYxhSdJv867L6A==",
-            "dev": true,
-            "requires": {
-                "fs-exists-sync": "^0.1.0",
-                "resolve-dir": "^0.1.0"
-            }
-        },
-        "find-pkg": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/find-pkg/-/find-pkg-0.1.2.tgz",
-            "integrity": "sha512-0rnQWcFwZr7eO0513HahrWafsc3CTFioEB7DRiEYCUM/70QXSY8f3mCST17HXLcPvEhzH/Ty/Bxd72ZZsr/yvw==",
-            "dev": true,
-            "requires": {
-                "find-file-up": "^0.1.2"
-            }
-        },
-        "find-process": {
-            "version": "1.4.7",
-            "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz",
-            "integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==",
-            "dev": true,
-            "requires": {
-                "chalk": "^4.0.0",
-                "commander": "^5.1.0",
-                "debug": "^4.1.1"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
         "find-up": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -23576,21 +22666,6 @@
             "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
             "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
         },
-        "for-in": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-            "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
-            "dev": true
-        },
-        "for-own": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-            "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
-            "dev": true,
-            "requires": {
-                "for-in": "^1.0.1"
-            }
-        },
         "forever-agent": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -23653,18 +22728,6 @@
                 }
             }
         },
-        "fs-constants": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-            "dev": true
-        },
-        "fs-exists-sync": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
-            "integrity": "sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==",
-            "dev": true
-        },
         "fs-extra": {
             "version": "10.1.0",
             "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
@@ -23858,39 +22921,6 @@
                 }
             }
         },
-        "global-modules": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
-            "integrity": "sha512-JeXuCbvYzYXcwE6acL9V2bAOeSIGl4dD+iwLY9iUx2VBJJ80R18HCn+JCwHM9Oegdfya3lEkGCdaRkSyc10hDA==",
-            "dev": true,
-            "requires": {
-                "global-prefix": "^0.1.4",
-                "is-windows": "^0.2.0"
-            }
-        },
-        "global-prefix": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
-            "integrity": "sha512-gOPiyxcD9dJGCEArAhF4Hd0BAqvAe/JzERP7tYumE4yIkmIedPUVXcJFWbV3/p/ovIIvKjkrTk+f1UVkq7vvbw==",
-            "dev": true,
-            "requires": {
-                "homedir-polyfill": "^1.0.0",
-                "ini": "^1.3.4",
-                "is-windows": "^0.2.0",
-                "which": "^1.2.12"
-            },
-            "dependencies": {
-                "which": {
-                    "version": "1.3.1",
-                    "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-                    "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-                    "dev": true,
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                }
-            }
-        },
         "globals": {
             "version": "11.12.0",
             "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -24017,15 +23047,6 @@
             "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.3.tgz",
             "integrity": "sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ=="
         },
-        "homedir-polyfill": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-            "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-            "dev": true,
-            "requires": {
-                "parse-passwd": "^1.0.0"
-            }
-        },
         "hosted-git-info": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
@@ -24275,12 +23296,6 @@
                 "has-tostringtag": "^1.0.0"
             }
         },
-        "is-buffer": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-            "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-            "dev": true
-        },
         "is-callable": {
             "version": "1.2.4",
             "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
@@ -24316,12 +23331,6 @@
             "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
             "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
         },
-        "is-extendable": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-            "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-            "dev": true
-        },
         "is-extglob": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -24510,12 +23519,6 @@
                 "call-bind": "^1.0.2"
             }
         },
-        "is-windows": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
-            "integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==",
-            "dev": true
-        },
         "is-wsl": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
@@ -24544,12 +23547,6 @@
             "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
             "devOptional": true
         },
-        "isobject": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-            "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-            "dev": true
-        },
         "isstream": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
@@ -24893,72 +23890,6 @@
                 }
             }
         },
-        "jest-dev-server": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-6.1.1.tgz",
-            "integrity": "sha512-z5LnaGDvlIkdMv/rppSO4+rq+GyQKf1xI9oiBxf9/2EBeN2hxRaWiMvaLNDnHPZj2PAhBXsycrKslDDoZO2Xtw==",
-            "dev": true,
-            "requires": {
-                "chalk": "^4.1.2",
-                "cwd": "^0.10.0",
-                "find-process": "^1.4.7",
-                "prompts": "^2.4.2",
-                "spawnd": "^6.0.2",
-                "tree-kill": "^1.2.2",
-                "wait-on": "^6.0.1"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
         "jest-diff": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
@@ -25124,70 +24055,6 @@
                 "jest-util": "^27.5.1"
             }
         },
-        "jest-environment-puppeteer": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/jest-environment-puppeteer/-/jest-environment-puppeteer-6.1.1.tgz",
-            "integrity": "sha512-Ces37g8Gdj7QaVxszeoXlvmsZxcEJN9EPUdJt8fGMLA+6ARVFKyVmFgP9xVeGyjTvzsXdtIiJdeOKMLMeD8r2A==",
-            "dev": true,
-            "requires": {
-                "chalk": "^4.1.2",
-                "cwd": "^0.10.0",
-                "jest-dev-server": "^6.1.1",
-                "jest-environment-node": "^27.4.4",
-                "merge-deep": "^3.0.3"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
         "jest-get-type": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
@@ -25448,16 +24315,6 @@
             "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
             "dev": true
         },
-        "jest-puppeteer": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/jest-puppeteer/-/jest-puppeteer-6.0.3.tgz",
-            "integrity": "sha512-6GRdbkWwNu8dfzo4icpwc50+K5ECYpWyD9sxpRa03PA8Hi3byl0dcAx+NjCivSezWjAl2Iwwhujqb+bczei0Bg==",
-            "dev": true,
-            "requires": {
-                "expect-puppeteer": "^6.0.2",
-                "jest-environment-puppeteer": "^6.0.3"
-            }
-        },
         "jest-regex-util": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
@@ -26277,15 +25134,6 @@
             "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
             "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
         },
-        "kind-of": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-            "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-            "dev": true,
-            "requires": {
-                "is-buffer": "^1.1.5"
-            }
-        },
         "kleur": {
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -26349,12 +25197,6 @@
             "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==",
             "dev": true
         },
-        "lazy-cache": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-            "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
-            "dev": true
-        },
         "leven": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -26722,17 +25564,6 @@
             "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==",
             "dev": true
         },
-        "merge-deep": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz",
-            "integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==",
-            "dev": true,
-            "requires": {
-                "arr-union": "^3.1.0",
-                "clone-deep": "^0.2.4",
-                "kind-of": "^3.0.2"
-            }
-        },
         "merge-descriptors": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -26844,35 +25675,11 @@
                 "yallist": "^4.0.0"
             }
         },
-        "mixin-object": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
-            "integrity": "sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==",
-            "dev": true,
-            "requires": {
-                "for-in": "^0.1.3",
-                "is-extendable": "^0.1.1"
-            },
-            "dependencies": {
-                "for-in": {
-                    "version": "0.1.8",
-                    "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-                    "integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g==",
-                    "dev": true
-                }
-            }
-        },
         "mkdirp": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
             "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
         },
-        "mkdirp-classic": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-            "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-            "dev": true
-        },
         "mqemitter": {
             "version": "4.5.0",
             "resolved": "https://registry.npmjs.org/mqemitter/-/mqemitter-4.5.0.tgz",
@@ -27381,12 +26188,6 @@
                 "word-wrap": "^1.2.3"
             }
         },
-        "os-homedir": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-            "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-            "dev": true
-        },
         "ospath": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz",
@@ -27473,12 +26274,6 @@
                 "lines-and-columns": "^1.1.6"
             }
         },
-        "parse-passwd": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-            "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
-            "dev": true
-        },
         "parse5": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.0.0.tgz",
@@ -27811,12 +26606,6 @@
             "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
             "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
         },
-        "progress": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-            "dev": true
-        },
         "prom-client": {
             "version": "13.2.0",
             "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-13.2.0.tgz",
@@ -27872,12 +26661,6 @@
                 "ipaddr.js": "1.9.1"
             }
         },
-        "proxy-from-env": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-            "dev": true
-        },
         "psl": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
@@ -27898,59 +26681,6 @@
             "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
             "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
         },
-        "puppeteer": {
-            "version": "13.1.3",
-            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-13.1.3.tgz",
-            "integrity": "sha512-nqcJNThLUG0Dgo++2mMtGR2FCyg7olJJhj/rm0A65muyN3nrH6lGvnNRzEaNmSnHWvjaDIG9ox5kxQB+nXTg5A==",
-            "dev": true,
-            "requires": {
-                "debug": "4.3.2",
-                "devtools-protocol": "0.0.948846",
-                "extract-zip": "2.0.1",
-                "https-proxy-agent": "5.0.0",
-                "node-fetch": "2.6.7",
-                "pkg-dir": "4.2.0",
-                "progress": "2.0.3",
-                "proxy-from-env": "1.1.0",
-                "rimraf": "3.0.2",
-                "tar-fs": "2.1.1",
-                "unbzip2-stream": "1.4.3",
-                "ws": "8.2.3"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "4.3.2",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-                    "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "2.1.2"
-                    }
-                },
-                "https-proxy-agent": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-                    "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-                    "dev": true,
-                    "requires": {
-                        "agent-base": "6",
-                        "debug": "4"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                },
-                "ws": {
-                    "version": "8.2.3",
-                    "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-                    "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
-                    "dev": true
-                }
-            }
-        },
         "qlobber": {
             "version": "5.0.3",
             "resolved": "https://registry.npmjs.org/qlobber/-/qlobber-5.0.3.tgz",
@@ -28447,16 +27177,6 @@
                 }
             }
         },
-        "resolve-dir": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
-            "integrity": "sha512-QxMPqI6le2u0dCLyiGzgy92kjkkL6zO0XyvHzjdTNH3zM6e5Hz3BwG6+aEyNgiQ5Xz6PwTwgQEj3U50dByPKIA==",
-            "dev": true,
-            "requires": {
-                "expand-tilde": "^1.2.2",
-                "global-modules": "^0.2.3"
-            }
-        },
         "resolve-from": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -28698,35 +27418,6 @@
             "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
             "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
         },
-        "shallow-clone": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
-            "integrity": "sha512-J1zdXCky5GmNnuauESROVu31MQSnLoYvlyEn6j2Ztk6Q5EHFIhxkMhYcv6vuDzl2XEzoRr856QwzMgWM/TmZgw==",
-            "dev": true,
-            "requires": {
-                "is-extendable": "^0.1.1",
-                "kind-of": "^2.0.1",
-                "lazy-cache": "^0.2.3",
-                "mixin-object": "^2.0.1"
-            },
-            "dependencies": {
-                "kind-of": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-                    "integrity": "sha512-0u8i1NZ/mg0b+W3MGGw5I7+6Eib2nx72S/QvXa0hYjEkjTknYmEYQJwGu3mLC0BrhtJjtQafTkyRUQ75Kx0LVg==",
-                    "dev": true,
-                    "requires": {
-                        "is-buffer": "^1.0.2"
-                    }
-                },
-                "lazy-cache": {
-                    "version": "0.2.7",
-                    "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
-                    "integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==",
-                    "dev": true
-                }
-            }
-        },
         "shebang-command": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -28928,17 +27619,6 @@
             "integrity": "sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==",
             "dev": true
         },
-        "spawnd": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/spawnd/-/spawnd-6.0.2.tgz",
-            "integrity": "sha512-+YJtx0dvy2wt304MrHD//tASc84zinBUYU1jacPBzrjhZUd7RsDo25krxr4HUHAQzEQFuMAs4/p+yLYU5ciZ1w==",
-            "dev": true,
-            "requires": {
-                "exit": "^0.1.2",
-                "signal-exit": "^3.0.6",
-                "tree-kill": "^1.2.2"
-            }
-        },
         "spdx-correct": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
@@ -29363,39 +28043,6 @@
                 "yallist": "^4.0.0"
             }
         },
-        "tar-fs": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-            "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-            "dev": true,
-            "requires": {
-                "chownr": "^1.1.1",
-                "mkdirp-classic": "^0.5.2",
-                "pump": "^3.0.0",
-                "tar-stream": "^2.1.4"
-            },
-            "dependencies": {
-                "chownr": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-                    "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-                    "dev": true
-                }
-            }
-        },
-        "tar-stream": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-            "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-            "dev": true,
-            "requires": {
-                "bl": "^4.0.3",
-                "end-of-stream": "^1.4.1",
-                "fs-constants": "^1.0.0",
-                "inherits": "^2.0.3",
-                "readable-stream": "^3.1.1"
-            }
-        },
         "tarn": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/tarn/-/tarn-3.0.2.tgz",
@@ -29704,16 +28351,6 @@
                 "which-boxed-primitive": "^1.0.2"
             }
         },
-        "unbzip2-stream": {
-            "version": "1.4.3",
-            "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-            "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-            "dev": true,
-            "requires": {
-                "buffer": "^5.2.1",
-                "through": "^2.3.8"
-            }
-        },
         "unicode-canonical-property-names-ecmascript": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
diff --git a/package.json b/package.json
index 479876a63..4f7da6815 100644
--- a/package.json
+++ b/package.json
@@ -25,8 +25,6 @@
         "build": "vite build --config ./config/vite.config.js",
         "test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --test",
         "test-with-build": "npm run build && npm test",
-        "jest": "node test/prepare-jest.js && npm run jest-frontend && npm run jest-backend",
-        "jest-frontend": "cross-env TEST_FRONTEND=1 jest --config=./config/jest-frontend.config.js",
         "jest-backend": "cross-env TEST_BACKEND=1 jest --config=./config/jest-backend.config.js",
         "tsc": "tsc",
         "vite-preview-dist": "vite preview --host --config ./config/vite.config.js",
@@ -140,12 +138,10 @@
         "eslint-plugin-vue": "~8.7.1",
         "favico.js": "^0.3.10",
         "jest": "~27.2.5",
-        "jest-puppeteer": "~6.0.3",
         "postcss-html": "~1.5.0",
         "postcss-rtlcss": "~3.7.2",
         "postcss-scss": "~4.0.4",
         "prismjs": "^1.27.0",
-        "puppeteer": "~13.1.3",
         "qrcode": "~1.5.0",
         "rollup-plugin-visualizer": "^5.6.0",
         "sass": "~1.42.1",
diff --git a/server/util-server.js b/server/util-server.js
index 1517bcfe8..cf303ba85 100644
--- a/server/util-server.js
+++ b/server/util-server.js
@@ -557,7 +557,7 @@ exports.doubleCheckPassword = async (socket, currentPassword) => {
 exports.startUnitTest = async () => {
     console.log("Starting unit test...");
     const npm = /^win/.test(process.platform) ? "npm.cmd" : "npm";
-    const child = childProcess.spawn(npm, [ "run", "jest" ]);
+    const child = childProcess.spawn(npm, [ "run", "jest-backend" ]);
 
     child.stdout.on("data", (data) => {
         console.log(data.toString());
diff --git a/test/e2e.spec.js b/test/e2e.spec.js
deleted file mode 100644
index 8de8ceb1f..000000000
--- a/test/e2e.spec.js
+++ /dev/null
@@ -1,329 +0,0 @@
-// eslint-disable-next-line no-unused-vars
-const { Page, Browser } = require("puppeteer");
-const { sleep } = require("../src/util");
-
-/**
- * Set back the correct data type for page object
- * @type {Page}
- */
-page;
-
-/**
- * @type {Browser}
- */
-browser;
-
-beforeAll(async () => {
-    await page.setViewport({
-        width: 1280,
-        height: 720,
-        deviceScaleFactor: 1,
-    });
-});
-
-afterAll(() => {
-
-});
-
-const baseURL = "http://127.0.0.1:3002";
-
-describe("Init", () => {
-    const title = "Uptime Kuma";
-
-    beforeAll(async () => {
-        await page.goto(baseURL);
-    });
-
-    it(`should be titled "${title}"`, async () => {
-        await expect(page.title()).resolves.toEqual(title);
-    });
-
-    // Setup Page
-    it("Setup", async () => {
-        // Create an Admin
-        await page.waitForSelector("#floatingInput");
-        await page.waitForSelector("#repeat");
-        await page.click("#floatingInput");
-        await page.type("#floatingInput", "admin");
-        await page.type("#floatingPassword", "admin123");
-        await page.type("#repeat", "admin123");
-        await page.click(".btn-primary[type=submit]");
-        await sleep(3000);
-
-        // Go to /setup again
-        await page.goto(baseURL + "/setup");
-        await sleep(3000);
-        let pathname = await page.evaluate(() => location.pathname);
-        expect(pathname).toEqual("/dashboard");
-
-        // Go to /
-        await page.goto(baseURL);
-        await page.waitForSelector("h1.mb-3");
-        pathname = await page.evaluate(() => location.pathname);
-        expect(pathname).toEqual("/dashboard");
-    });
-
-    it("should create monitor", async () => {
-        // Create monitor
-        await page.goto(baseURL + "/add");
-        await page.waitForSelector("#name");
-
-        await page.type("#name", "Myself");
-        await page.waitForSelector("#url");
-        await page.click("#url", { clickCount: 3 });
-        await page.keyboard.type(baseURL);
-        await page.keyboard.press("Enter");
-
-        await page.waitForFunction(() => {
-            const badge = document.querySelector("span.badge");
-            return badge && badge.innerText == "100%";
-        }, { timeout: 5000 });
-
-    });
-
-    // Settings Page
-    /*
-    describe("Settings", () => {
-        beforeEach(async () => {
-            await page.goto(baseURL + "/settings");
-        });
-
-        it("Change Language", async () => {
-            await page.goto(baseURL + "/settings/appearance");
-            await page.waitForSelector("#language");
-
-            await page.select("#language", "zh-HK");
-            let languageTitle = await page.evaluate(() => document.querySelector("[for=language]").innerText);
-            expect(languageTitle).toEqual("語言");
-
-            await page.select("#language", "en");
-            languageTitle = await page.evaluate(() => document.querySelector("[for=language]").innerText);
-            expect(languageTitle).toEqual("Language");
-        });
-
-        it("Change Theme", async () => {
-            await page.goto(baseURL + "/settings/appearance");
-
-            // Dark
-            await click(page, ".btn[for=btncheck2]");
-            await page.waitForSelector("div.dark");
-
-            await page.waitForSelector(".btn[for=btncheck1]");
-
-            // Light
-            await click(page, ".btn[for=btncheck1]");
-            await page.waitForSelector("div.light");
-        });
-
-        it("Change Heartbeat Bar Style", async () => {
-            await page.goto(baseURL + "/settings/appearance");
-
-            // Bottom
-            await click(page, ".btn[for=btncheck5]");
-            await page.waitForSelector("div.hp-bar-big");
-
-            // None
-            await click(page, ".btn[for=btncheck6]");
-            await page.waitForSelector("div.hp-bar-big", {
-                hidden: true,
-                timeout: 1000
-            });
-        });
-
-        // TODO: Timezone
-
-        it("Search Engine Visibility", async () => {
-            // Default
-            let res = await axios.get(baseURL + "/robots.txt");
-            expect(res.data).toContain("Disallow: /");
-
-            // Yes
-            await click(page, "#searchEngineIndexYes");
-            await click(page, "form > div > .btn[type=submit]");
-            await sleep(1000);
-            res = await axios.get(baseURL + "/robots.txt");
-            expect(res.data).not.toContain("Disallow: /");
-
-            // No
-            await click(page, "#searchEngineIndexNo");
-            await click(page, "form > div > .btn[type=submit]");
-            await sleep(1000);
-            res = await axios.get(baseURL + "/robots.txt");
-            expect(res.data).toContain("Disallow: /");
-        });
-
-        it("Entry Page", async () => {
-            const newPage = await browser.newPage();
-
-            // Default
-            await newPage.goto(baseURL);
-            await newPage.waitForSelector("h1.mb-3", { timeout: 3000 });
-            let pathname = await newPage.evaluate(() => location.pathname);
-            expect(pathname).toEqual("/dashboard");
-
-            // Status Page
-            await click(page, "#entryPageNo");
-            await click(page, "form > div > .btn[type=submit]");
-            await sleep(1000);
-            await newPage.goto(baseURL);
-            await newPage.waitForSelector("img.logo", { timeout: 3000 });
-            pathname = await newPage.evaluate(() => location.pathname);
-            expect(pathname).toEqual("/status");
-
-            // Back to Dashboard
-            await click(page, "#entryPageYes");
-            await click(page, "form > div > .btn[type=submit]");
-            await sleep(1000);
-            await newPage.goto(baseURL);
-            await newPage.waitForSelector("h1.mb-3", { timeout: 3000 });
-            pathname = await newPage.evaluate(() => location.pathname);
-            expect(pathname).toEqual("/dashboard");
-
-            await newPage.close();
-        });
-
-        it("Change Password (wrong current password)", async () => {
-            await page.goto(baseURL + "/settings/security");
-            await page.waitForSelector("#current-password");
-
-            await page.type("#current-password", "wrong_passw$$d");
-            await page.type("#new-password", "new_password123");
-            await page.type("#repeat-new-password", "new_password123");
-
-            // Save
-            await click(page, "form > div > .btn[type=submit]", 0);
-            await sleep(1000);
-
-            await click(page, "#logout-btn");
-            await login("admin", "new_password123");
-            let elementCount = await page.evaluate(() => document.querySelectorAll("#floatingPassword").length);
-            expect(elementCount).toEqual(1);
-
-            await login("admin", "admin123");
-        });
-
-        it("Change Password (wrong repeat)", async () => {
-            await page.goto(baseURL + "/settings/security");
-            await page.waitForSelector("#current-password");
-
-            await page.type("#current-password", "admin123");
-            await page.type("#new-password", "new_password123");
-            await page.type("#repeat-new-password", "new_password1234567898797898");
-
-            await click(page, "form > div > .btn[type=submit]", 0);
-            await sleep(1000);
-
-            await click(page, "#logout-btn");
-            await login("admin", "new_password123");
-
-            let elementCount = await page.evaluate(() => document.querySelectorAll("#floatingPassword").length);
-            expect(elementCount).toEqual(1);
-
-            await login("admin", "admin123");
-            await page.waitForSelector("#current-password");
-            let pathname = await page.evaluate(() => location.pathname);
-            expect(pathname).toEqual("/settings/security");
-        });
-
-        // TODO: 2FA
-
-        // TODO: Export Backup
-
-        // TODO: Import Backup
-
-        it("Should disable & enable auth", async () => {
-            await page.goto(baseURL + "/settings/security");
-            await click(page, "#disableAuth-btn");
-            await click(page, ".btn.btn-danger[data-bs-dismiss='modal']", 2); // Not a good way to do it
-            await page.waitForSelector("#enableAuth-btn", { timeout: 3000 });
-            await page.waitForSelector("#logout-btn", {
-                hidden: true,
-                timeout: 3000
-            });
-
-            const newPage = await browser.newPage();
-            await newPage.goto(baseURL);
-            await newPage.waitForSelector("span.badge", { timeout: 3000 });
-            newPage.close();
-
-            await click(page, "#enableAuth-btn");
-            await login("admin", "admin123");
-            await page.waitForSelector("#disableAuth-btn", { timeout: 3000 });
-        });
-
-        // it("Should clear all statistics", async () => {
-        //     await page.goto(baseURL + "/settings/monitor-history");
-        //     await click(page, "#clearAllStats-btn");
-        //     await click(page, ".btn.btn-danger");
-        //     await page.waitForFunction(() => {
-        //         const badge = document.querySelector("span.badge");
-        //         return badge && badge.innerText == "0%";
-        //     }, { timeout: 3000 });
-        // });
-    });
-     */
-
-    /*
-     * TODO
-     * Create Monitor - All type
-     * Edit Monitor
-     * Delete Monitor
-     *
-     * Create Notification (token problem, maybe hard to test)
-     *
-     */
-
-    describe("Status Page", () => {
-        const title = "Uptime Kuma";
-        beforeAll(async () => {
-            await page.goto(baseURL + "/status");
-        });
-        it(`should be titled "${title}"`, async () => {
-            await expect(page.title()).resolves.toEqual(title);
-        });
-    });
-});
-
-/**
- * Test login
- * @param {string} username
- * @param {string} password
- */
-async function login(username, password) {
-    await input(page, "#floatingInput", username);
-    await input(page, "#floatingPassword", password);
-    await page.click(".btn-primary[type=submit]");
-    await sleep(5000);
-}
-
-/**
- * Click on an element on the page
- * @param {Page} page Puppeteer page instance
- * @param {string} selector
- * @param {number} elementIndex
- * @returns {Promise<any>}
- */
-async function click(page, selector, elementIndex = 0) {
-    await page.waitForSelector(selector, {
-        timeout: 5000,
-    });
-    return await page.evaluate((s, i) => {
-        return document.querySelectorAll(s)[i].click();
-    }, selector, elementIndex);
-}
-
-/**
- * Input text into selected field
- * @param {Page} page Puppeteer page instance
- * @param {string} selector
- * @param {string} text Text to input
- */
-async function input(page, selector, text) {
-    await page.waitForSelector(selector, {
-        timeout: 5000,
-    });
-    const element = await page.$(selector);
-    await element.click({ clickCount: 3 });
-    await page.keyboard.press("Backspace");
-    await page.type(selector, text);
-}
diff --git a/test/frontend.spec.js b/test/frontend.spec.js
deleted file mode 100644
index 63121a6ba..000000000
--- a/test/frontend.spec.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// eslint-disable-next-line no-global-assign
-global.localStorage = {};
-global.navigator = {
-    language: "en"
-};
-
-const { currentLocale } = require("../src/i18n");
-
-describe("Test i18n.js", () => {
-
-    it("currentLocale()", () => {
-        expect(currentLocale()).toEqual("en");
-
-        navigator.language = "zh-HK";
-        expect(currentLocale()).toEqual("zh-HK");
-
-        // Note that in Safari on iOS prior to 10.2, the country code returned is lowercase: "en-us", "fr-fr" etc.
-        // https://developer.mozilla.org/en-US/docs/Web/API/Navigator/language
-        navigator.language = "zh-hk";
-        expect(currentLocale()).toEqual("en");
-
-        navigator.language = "en-US";
-        expect(currentLocale()).toEqual("en");
-
-        navigator.language = "ja-ZZ";
-        expect(currentLocale()).toEqual("ja");
-
-        navigator.language = "zz";
-        expect(currentLocale()).toEqual("en");
-
-        navigator.language = "zz-ZZ";
-        expect(currentLocale()).toEqual("en");
-
-        localStorage.locale = "en";
-        expect(currentLocale()).toEqual("en");
-
-        localStorage.locale = "zh-HK";
-        expect(currentLocale()).toEqual("zh-HK");
-    });
-
-});
-
diff --git a/test/prepare-jest.js b/test/prepare-jest.js
deleted file mode 100644
index 3fd89d10b..000000000
--- a/test/prepare-jest.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const fs = require("fs");
-const rmSync = require("../extra/fs-rmSync.js");
-
-const path = "./data/test-chrome-profile";
-
-if (fs.existsSync(path)) {
-    rmSync(path, {
-        recursive: true,
-    });
-}

From 528a615fb2b330c05efc86a41cea678bc5b1dff3 Mon Sep 17 00:00:00 2001
From: CL0Pinette <51855790+CL0Pinette@users.noreply.github.com>
Date: Wed, 5 Oct 2022 11:30:49 +0200
Subject: [PATCH 26/30] Add free.fr SMS notification provider (#2159)

---
 server/notification-providers/freemobile.js | 24 +++++++++++++++++++++
 server/notification.js                      |  2 ++
 src/components/notifications/FreeMobile.vue | 12 +++++++++++
 src/components/notifications/index.js       |  2 ++
 4 files changed, 40 insertions(+)
 create mode 100644 server/notification-providers/freemobile.js
 create mode 100644 src/components/notifications/FreeMobile.vue

diff --git a/server/notification-providers/freemobile.js b/server/notification-providers/freemobile.js
new file mode 100644
index 000000000..919150fa0
--- /dev/null
+++ b/server/notification-providers/freemobile.js
@@ -0,0 +1,24 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+
+class FreeMobile extends NotificationProvider {
+
+    name = "FreeMobile";
+
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let okMsg = "Sent Successfully.";
+        try {
+            await axios.post(`https://smsapi.free-mobile.fr/sendmsg?msg=${encodeURIComponent(msg.replace("🔴", "⛔️"))}`, {
+                "user": notification.freemobileUser,
+                "pass": notification.freemobilePass,
+            });
+
+            return okMsg;
+
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+}
+
+module.exports = FreeMobile;
diff --git a/server/notification.js b/server/notification.js
index 7a4b4f29f..aed92e5dc 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -9,6 +9,7 @@ const ClickSendSMS = require("./notification-providers/clicksendsms");
 const DingDing = require("./notification-providers/dingding");
 const Discord = require("./notification-providers/discord");
 const Feishu = require("./notification-providers/feishu");
+const FreeMobile = require("./notification-providers/freemobile");
 const GoogleChat = require("./notification-providers/google-chat");
 const Gorush = require("./notification-providers/gorush");
 const Gotify = require("./notification-providers/gotify");
@@ -63,6 +64,7 @@ class Notification {
             new DingDing(),
             new Discord(),
             new Feishu(),
+            new FreeMobile(),
             new GoogleChat(),
             new Gorush(),
             new Gotify(),
diff --git a/src/components/notifications/FreeMobile.vue b/src/components/notifications/FreeMobile.vue
new file mode 100644
index 000000000..852d9ae2a
--- /dev/null
+++ b/src/components/notifications/FreeMobile.vue
@@ -0,0 +1,12 @@
+<template>
+    <div class="mb-3">
+        <label for="freemobileUser" class="form-label">{{ $t("Free Mobile User Identifier") }}<span style="color: red;"><sup>*</sup></span></label>
+        <input id="freemobileUser" v-model="$parent.notification.freemobileUser" type="text" class="form-control" required>
+    </div>
+
+    <div class="mb-3">
+        <label for="freemobilePass" class="form-label">{{ $t("Free Mobile API Key") }}<span style="color: red;"><sup>*</sup></span></label>
+        <input id="freemobilePass" v-model="$parent.notification.freemobilePass" type="text" class="form-control" required>
+    </div>
+</template>
+
diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
index 319a7922e..bca4a510d 100644
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@@ -7,6 +7,7 @@ import ClickSendSMS from "./ClickSendSMS.vue";
 import DingDing from "./DingDing.vue";
 import Discord from "./Discord.vue";
 import Feishu from "./Feishu.vue";
+import FreeMobile from "./FreeMobile.vue";
 import GoogleChat from "./GoogleChat.vue";
 import Gorush from "./Gorush.vue";
 import Gotify from "./Gotify.vue";
@@ -56,6 +57,7 @@ const NotificationFormList = {
     "DingDing": DingDing,
     "discord": Discord,
     "Feishu": Feishu,
+    "FreeMobile": FreeMobile,
     "GoogleChat": GoogleChat,
     "gorush": Gorush,
     "gotify": Gotify,

From c28d8ddff9342da501e60df23cbb79e3259a4306 Mon Sep 17 00:00:00 2001
From: Ben Scobie <benscobie@users.noreply.github.com>
Date: Wed, 5 Oct 2022 16:45:21 +0100
Subject: [PATCH 27/30] Correctly handle multiple IPs in X-Forwarded-For
 (#2177)

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
---
 package.json                 |  4 +-
 server/uptime-kuma-server.js |  4 +-
 test/backend.spec.js         | 83 +++++++++++++++++++++++++++++++++++-
 3 files changed, 87 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 4f7da6815..1411168d0 100644
--- a/package.json
+++ b/package.json
@@ -23,9 +23,9 @@
         "start-server": "node server/server.js",
         "start-server-dev": "cross-env NODE_ENV=development node server/server.js",
         "build": "vite build --config ./config/vite.config.js",
-        "test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --test",
+        "test": "node test/prepare-test-server.js && npm run jest-backend",
         "test-with-build": "npm run build && npm test",
-        "jest-backend": "cross-env TEST_BACKEND=1 jest --config=./config/jest-backend.config.js",
+        "jest-backend": "cross-env TEST_BACKEND=1 jest --runInBand --detectOpenHandles --forceExit --config=./config/jest-backend.config.js",
         "tsc": "tsc",
         "vite-preview-dist": "vite preview --host --config ./config/vite.config.js",
         "build-docker": "npm run build && npm run build-docker-debian && npm run build-docker-alpine",
diff --git a/server/uptime-kuma-server.js b/server/uptime-kuma-server.js
index 98de65a43..6e77e1fd2 100644
--- a/server/uptime-kuma-server.js
+++ b/server/uptime-kuma-server.js
@@ -138,7 +138,9 @@ class UptimeKumaServer {
         }
 
         if (await Settings.get("trustProxy")) {
-            return socket.client.conn.request.headers["x-forwarded-for"]
+            const forwardedFor = socket.client.conn.request.headers["x-forwarded-for"];
+
+            return (typeof forwardedFor === "string" ? forwardedFor.split(",")[0].trim() : null)
                 || socket.client.conn.request.headers["x-real-ip"]
                 || clientIP.replace(/^.*:/, "");
         } else {
diff --git a/test/backend.spec.js b/test/backend.spec.js
index 6deb28534..5b9fa92c6 100644
--- a/test/backend.spec.js
+++ b/test/backend.spec.js
@@ -1,7 +1,11 @@
-const { genSecret, DOWN } = require("../src/util");
+const { genSecret, DOWN, log} = require("../src/util");
 const utilServerRewire = require("../server/util-server");
 const Discord = require("../server/notification-providers/discord");
 const axios = require("axios");
+const { UptimeKumaServer } = require("../server/uptime-kuma-server");
+const Database = require("../server/database");
+const {Settings} = require("../server/settings");
+const fs = require("fs");
 
 jest.mock("axios");
 
@@ -225,3 +229,80 @@ describe("The function filterAndJoin", () => {
         expect(result).toBe("");
     });
 });
+
+describe("Test uptimeKumaServer.getClientIP()", () => {
+    it("should able to get a correct client IP", async () => {
+        Database.init({
+            "data-dir": "./data/test"
+        });
+
+        if (! fs.existsSync(Database.path)) {
+            log.info("server", "Copying Database");
+            fs.copyFileSync(Database.templatePath, Database.path);
+        }
+
+        await Database.connect(true);
+        await Database.patch();
+
+        const fakeSocket = {
+            client: {
+                conn: {
+                    remoteAddress: "192.168.10.10",
+                    request: {
+                        headers: {
+                        }
+                    }
+                }
+            }
+        }
+        const server = Object.create(UptimeKumaServer.prototype);
+        let ip = await server.getClientIP(fakeSocket);
+
+        await Settings.set("trustProxy", false);
+        expect(await Settings.get("trustProxy")).toBe(false);
+        expect(ip).toBe("192.168.10.10");
+
+        fakeSocket.client.conn.request.headers["x-forwarded-for"] = "10.10.10.10";
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("192.168.10.10");
+
+        fakeSocket.client.conn.request.headers["x-real-ip"] = "20.20.20.20";
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("192.168.10.10");
+
+        await Settings.set("trustProxy", true);
+        expect(await Settings.get("trustProxy")).toBe(true);
+
+        fakeSocket.client.conn.request.headers["x-forwarded-for"] = "10.10.10.10";
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("10.10.10.10");
+
+        // x-real-ip
+        delete fakeSocket.client.conn.request.headers["x-forwarded-for"];
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("20.20.20.20");
+
+        fakeSocket.client.conn.request.headers["x-forwarded-for"] = "2001:db8:85a3:8d3:1319:8a2e:370:7348";
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("2001:db8:85a3:8d3:1319:8a2e:370:7348");
+
+        fakeSocket.client.conn.request.headers["x-forwarded-for"] = "203.0.113.195";
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("203.0.113.195");
+
+        fakeSocket.client.conn.request.headers["x-forwarded-for"] = "203.0.113.195, 2001:db8:85a3:8d3:1319:8a2e:370:7348";
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("203.0.113.195");
+
+        fakeSocket.client.conn.request.headers["x-forwarded-for"] = "203.0.113.195,2001:db8:85a3:8d3:1319:8a2e:370:7348,150.172.238.178";
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("203.0.113.195");
+
+        // Elements are comma-separated, with optional whitespace surrounding the commas.
+        fakeSocket.client.conn.request.headers["x-forwarded-for"] = "203.0.113.195 , 2001:db8:85a3:8d3:1319:8a2e:370:7348,150.172.238.178";
+        ip = await server.getClientIP(fakeSocket);
+        expect(ip).toBe("203.0.113.195");
+
+        await Database.close();
+    }, 120000);
+});

From c24b64921d08b6d5c0cfc060fe35e43ecdbce20b Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Thu, 6 Oct 2022 23:28:06 +0800
Subject: [PATCH 28/30] Fix #2183 ntfy issue

---
 server/notification-providers/ntfy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/notification-providers/ntfy.js b/server/notification-providers/ntfy.js
index 17d6d812a..5381da466 100644
--- a/server/notification-providers/ntfy.js
+++ b/server/notification-providers/ntfy.js
@@ -9,7 +9,7 @@ class Ntfy extends NotificationProvider {
         let okMsg = "Sent Successfully.";
         try {
             let headers = {};
-            if (notification.ntfyusername.length > 0) {
+            if (notification.ntfyusername) {
                 headers = {
                     "Authorization": "Basic " + Buffer.from(notification.ntfyusername + ":" + notification.ntfypassword).toString("base64"),
                 };

From 60460442f869f2cc581690bd7c8930b3eb7777b8 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Fri, 7 Oct 2022 00:25:34 +0800
Subject: [PATCH 29/30] Update to 1.18.3

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1411168d0..df0bdbfb6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "uptime-kuma",
-    "version": "1.18.2",
+    "version": "1.18.3",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -38,7 +38,7 @@
         "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
         "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push",
         "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
-        "setup": "git checkout 1.18.2 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.18.3 && npm ci --production && npm run download-dist",
         "download-dist": "node extra/download-dist.js",
         "mark-as-nightly": "node extra/mark-as-nightly.js",
         "reset-password": "node extra/reset-password.js",

From 6e07ed20816969bfd1c6c06eb518171938312782 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Fri, 7 Oct 2022 15:02:19 +0800
Subject: [PATCH 30/30] Fix #2186

---
 package-lock.json           | 41 +++++++++++++++++++++++++++----------
 package.json                |  1 +
 server/model/status_page.js | 15 ++++++++++----
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 718270427..4f2221714 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "uptime-kuma",
-    "version": "1.18.2",
+    "version": "1.18.3",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "uptime-kuma",
-            "version": "1.18.2",
+            "version": "1.18.3",
             "license": "MIT",
             "dependencies": {
                 "@louislam/sqlite3": "~15.0.6",
@@ -33,6 +33,7 @@
                 "http-proxy-agent": "^5.0.0",
                 "https-proxy-agent": "^5.0.0",
                 "iconv-lite": "^0.6.3",
+                "jsesc": "^3.0.2",
                 "jsonwebtoken": "~8.5.1",
                 "jwt-decode": "^3.1.2",
                 "limiter": "^2.1.0",
@@ -474,6 +475,18 @@
                 "node": ">=6.9.0"
             }
         },
+        "node_modules/@babel/generator/node_modules/jsesc": {
+            "version": "2.5.2",
+            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+            "dev": true,
+            "bin": {
+                "jsesc": "bin/jsesc"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
         "node_modules/@babel/helper-annotate-as-pure": {
             "version": "7.18.6",
             "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
@@ -11229,15 +11242,14 @@
             "dev": true
         },
         "node_modules/jsesc": {
-            "version": "2.5.2",
-            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-            "dev": true,
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+            "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
             "bin": {
                 "jsesc": "bin/jsesc"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=6"
             }
         },
         "node_modules/json-parse-even-better-errors": {
@@ -16957,6 +16969,14 @@
                 "@babel/types": "^7.18.13",
                 "@jridgewell/gen-mapping": "^0.3.2",
                 "jsesc": "^2.5.1"
+            },
+            "dependencies": {
+                "jsesc": {
+                    "version": "2.5.2",
+                    "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+                    "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+                    "dev": true
+                }
             }
         },
         "@babel/helper-annotate-as-pure": {
@@ -25010,10 +25030,9 @@
             }
         },
         "jsesc": {
-            "version": "2.5.2",
-            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-            "dev": true
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+            "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="
         },
         "json-parse-even-better-errors": {
             "version": "2.3.1",
diff --git a/package.json b/package.json
index df0bdbfb6..d478a1d24 100644
--- a/package.json
+++ b/package.json
@@ -88,6 +88,7 @@
         "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.0",
         "iconv-lite": "^0.6.3",
+        "jsesc": "^3.0.2",
         "jsonwebtoken": "~8.5.1",
         "jwt-decode": "^3.1.2",
         "limiter": "^2.1.0",
diff --git a/server/model/status_page.js b/server/model/status_page.js
index 82d184bfd..7682272c9 100644
--- a/server/model/status_page.js
+++ b/server/model/status_page.js
@@ -2,6 +2,7 @@ const { BeanModel } = require("redbean-node/dist/bean-model");
 const { R } = require("redbean-node");
 const cheerio = require("cheerio");
 const { UptimeKumaServer } = require("../uptime-kuma-server");
+const jsesc = require("jsesc");
 
 class StatusPage extends BeanModel {
 
@@ -56,13 +57,19 @@ class StatusPage extends BeanModel {
         head.append(`<meta property="og:description" content="${description155}" />`);
 
         // Preload data
-        const json = JSON.stringify(await StatusPage.getStatusPageData(statusPage));
-        head.append(`
-            <script>
-                window.preloadData = ${json}
+        // Add jsesc, fix https://github.com/louislam/uptime-kuma/issues/2186
+        const escapedJSONObject = jsesc(JSON.stringify(await StatusPage.getStatusPageData(statusPage)), {
+            "isScriptContext": true
+        });
+
+        const script = $(`
+            <script id="preload-data" data-json="{}">
+                window.preloadData = ${escapedJSONObject};
             </script>
         `);
 
+        head.append(script);
+
         // manifest.json
         $("link[rel=manifest]").attr("href", `/api/status-page/${statusPage.slug}/manifest.json`);