From c0c9b5b2b90d3d323ec8172bbf94ea55711f53ff Mon Sep 17 00:00:00 2001
From: hc-github-team-consul-core <github-team-consul-core@hashicorp.com>
Date: Fri, 13 Sep 2024 09:17:40 -0400
Subject: [PATCH] Backport of [ui] Markdown-it pinned into release/1.19.x
 (#21725)

backport of commit b7d3a18f79cc01edda5fa78f8ed377319a216480

Co-authored-by: Phil Renaud <phil@riotindustries.com>
---
 .changelog/21717.txt |  3 +++
 ui/package.json      |  3 ++-
 ui/yarn.lock         | 25 +------------------------
 3 files changed, 6 insertions(+), 25 deletions(-)
 create mode 100644 .changelog/21717.txt

diff --git a/.changelog/21717.txt b/.changelog/21717.txt
new file mode 100644
index 000000000000..2b51e643020d
--- /dev/null
+++ b/.changelog/21717.txt
@@ -0,0 +1,3 @@
+```release-note:security
+ui: Pin a newer resolution of Markdown-it
+```
diff --git a/ui/package.json b/ui/package.json
index cd95329705a8..daa968cea7e6 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -23,7 +23,8 @@
     "xmlhttprequest-ssl": "^1.6.3",
     "ember-basic-dropdown": "3.0.21",
     "glob": "7.2.3",
-    "braces": "^3.0.0"
+    "braces": "^3.0.0",
+    "markdown-it": "^12.3.2"
   },
   "engines": {
     "node": "18"
diff --git a/ui/yarn.lock b/ui/yarn.lock
index b4196ad2eb6d..08fa6b819524 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -7812,11 +7812,6 @@ entities@^3.0.1:
   resolved "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
   integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
 
-entities@~1.1.1:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
-  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-
 entities@~2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
@@ -10659,13 +10654,6 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-linkify-it@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
-  integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==
-  dependencies:
-    uc.micro "^1.0.1"
-
 linkify-it@^3.0.1:
   version "3.0.3"
   resolved "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
@@ -11111,7 +11099,7 @@ markdown-it-terminal@0.2.1:
     lodash.merge "^4.6.2"
     markdown-it "^8.3.1"
 
-markdown-it@^12.0.4:
+markdown-it@12.3.2, markdown-it@^12.0.4, markdown-it@^8.3.1:
   version "12.3.2"
   resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
   integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
@@ -11122,17 +11110,6 @@ markdown-it@^12.0.4:
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
-markdown-it@^8.3.1:
-  version "8.4.2"
-  resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
-  integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==
-  dependencies:
-    argparse "^1.0.7"
-    entities "~1.1.1"
-    linkify-it "^2.0.0"
-    mdurl "^1.0.1"
-    uc.micro "^1.0.5"
-
 markdown-table@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz#194a90ced26d31fe753d8b9434430214c011865b"