From c3260bbf51bb119f4dfae6aa0c7bc0837852ef13 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Sat, 2 Dec 2023 18:43:41 +0800
Subject: [PATCH] Merge lock file

---
 package-lock.json | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 96311c9b..8fb4c7a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -142,7 +142,7 @@
                 "vue-router": "~4.0.14",
                 "vue-toastification": "~2.0.0-rc.5",
                 "vuedraggable": "~4.1.0",
-                "wait-on": "^6.0.1",
+                "wait-on": "^7.2.0",
                 "whatwg-url": "~12.0.1"
             },
             "engines": {
@@ -16126,31 +16126,33 @@
             }
         },
         "node_modules/wait-on": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-6.0.1.tgz",
-            "integrity": "sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==",
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.2.0.tgz",
+            "integrity": "sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==",
             "dev": true,
             "dependencies": {
-                "axios": "^0.25.0",
-                "joi": "^17.6.0",
+                "axios": "^1.6.1",
+                "joi": "^17.11.0",
                 "lodash": "^4.17.21",
-                "minimist": "^1.2.5",
-                "rxjs": "^7.5.4"
+                "minimist": "^1.2.8",
+                "rxjs": "^7.8.1"
             },
             "bin": {
                 "wait-on": "bin/wait-on"
             },
             "engines": {
-                "node": ">=10.0.0"
+                "node": ">=12.0.0"
             }
         },
         "node_modules/wait-on/node_modules/axios": {
-            "version": "0.25.0",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
-            "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
+            "version": "1.6.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+            "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
             "dev": true,
             "dependencies": {
-                "follow-redirects": "^1.14.7"
+                "follow-redirects": "^1.15.0",
+                "form-data": "^4.0.0",
+                "proxy-from-env": "^1.1.0"
             }
         },
         "node_modules/wait-on/node_modules/joi": {
@@ -16166,6 +16168,12 @@
                 "@sideway/pinpoint": "^2.0.0"
             }
         },
+        "node_modules/wait-on/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/walker": {
             "version": "1.0.8",
             "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",