From 8c5fccd5e0abe625fcfcaa118c54497c01e7f43e Mon Sep 17 00:00:00 2001
From: "vitess-bot[bot]" <108069721+vitess-bot[bot]@users.noreply.github.com>
Date: Wed, 31 Jul 2024 17:09:53 -0400
Subject: [PATCH 1/2] Cherry-pick 43e828049cc5e46ef425b180e4af494edcf65a48 with
 conflicts

---
 web/vtadmin/package-lock.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/web/vtadmin/package-lock.json b/web/vtadmin/package-lock.json
index 7f5755e5cc4..424b92de51f 100644
--- a/web/vtadmin/package-lock.json
+++ b/web/vtadmin/package-lock.json
@@ -9588,7 +9588,7 @@
         "whatwg-encoding": "^2.0.0",
         "whatwg-mimetype": "^3.0.0",
         "whatwg-url": "^12.0.1",
-        "ws": "^8.13.0",
+        "ws": "^8.17.1",
         "xml-name-validator": "^4.0.0"
       },
       "engines": {
@@ -17478,9 +17478,15 @@
       }
     },
     "node_modules/ws": {
+<<<<<<< HEAD
       "version": "8.13.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
       "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+=======
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+>>>>>>> 43e828049c (VTAdmin: Upgrade websockets js package (#16504))
       "dev": true,
       "engines": {
         "node": ">=10.0.0"

From 2472190c02ad99afbbb99296e559c3da9e84bb11 Mon Sep 17 00:00:00 2001
From: Matt Lord <mattalord@gmail.com>
Date: Wed, 31 Jul 2024 17:39:16 -0400
Subject: [PATCH 2/2] Fix conflict

Signed-off-by: Matt Lord <mattalord@gmail.com>
---
 web/vtadmin/package-lock.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/web/vtadmin/package-lock.json b/web/vtadmin/package-lock.json
index 424b92de51f..9055b1469bc 100644
--- a/web/vtadmin/package-lock.json
+++ b/web/vtadmin/package-lock.json
@@ -17478,15 +17478,9 @@
       }
     },
     "node_modules/ws": {
-<<<<<<< HEAD
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-=======
       "version": "8.18.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
->>>>>>> 43e828049c (VTAdmin: Upgrade websockets js package (#16504))
       "dev": true,
       "engines": {
         "node": ">=10.0.0"