From ca2627d3cf98e62759bd972b3fd3bc6970b7b365 Mon Sep 17 00:00:00 2001
From: Krishan <33421343+kfiven@users.noreply.github.com>
Date: Fri, 8 Jul 2022 20:29:07 +0530
Subject: [PATCH] Bump linkifyjs 2.1.9 to 4.0.0-beta.5 (#665)

---
 package-lock.json      | 45 ++++++++++++++++++++----------------------
 package.json           |  3 ++-
 src/util/twemojify.jsx |  2 +-
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f08c4d3..7bb70f6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,8 @@
         "formik": "^2.2.9",
         "html-react-parser": "^2.0.0",
         "katex": "^0.15.6",
-        "linkifyjs": "^2.1.9",
+        "linkify-html": "^4.0.0-beta.5",
+        "linkifyjs": "^4.0.0-beta.5",
         "matrix-js-sdk": "^18.1.0",
         "micromark": "^3.0.10",
         "micromark-extension-gfm": "^2.0.1",
@@ -8290,12 +8291,6 @@
       "integrity": "sha512-+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw==",
       "dev": true
     },
-    "node_modules/jquery": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==",
-      "peer": true
-    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -8719,16 +8714,19 @@
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/linkifyjs": {
-      "version": "2.1.9",
-      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.9.tgz",
-      "integrity": "sha512-74ivurkK6WHvHFozVaGtQWV38FzBwSTGNmJolEgFp7QgR2bl6ArUWlvT4GcHKbPe1z3nWYi+VUdDZk16zDOVug==",
+    "node_modules/linkify-html": {
+      "version": "4.0.0-beta.5",
+      "resolved": "https://registry.npmjs.org/linkify-html/-/linkify-html-4.0.0-beta.5.tgz",
+      "integrity": "sha512-7upWBgItubM1yQhO1MozvSzl2bCWModOgcc1Wd7kPpndlbR1JxmqH/N0UzmdvX6g0PX0ftnCQdYV4RZHLP9D5g==",
       "peerDependencies": {
-        "jquery": ">= 1.11.0",
-        "react": ">= 0.14.0",
-        "react-dom": ">= 0.14.0"
+        "linkifyjs": "^4.0.0-beta.1"
       }
     },
+    "node_modules/linkifyjs": {
+      "version": "4.0.0-beta.5",
+      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.0.0-beta.5.tgz",
+      "integrity": "sha512-j0YWN/Qd9XuReN4QdU/aMNFtfzBzyi1e07FkxEyeRjfxMKpfmMAofNT80q1vgQ4/U0WUZ/73nBOEpjdyfoUhGw=="
+    },
     "node_modules/load-bmfont": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.1.tgz",
@@ -20325,12 +20323,6 @@
       "integrity": "sha512-+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw==",
       "dev": true
     },
-    "jquery": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==",
-      "peer": true
-    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -20695,12 +20687,17 @@
         "computed-style": "~0.1.3"
       }
     },
-    "linkifyjs": {
-      "version": "2.1.9",
-      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.9.tgz",
-      "integrity": "sha512-74ivurkK6WHvHFozVaGtQWV38FzBwSTGNmJolEgFp7QgR2bl6ArUWlvT4GcHKbPe1z3nWYi+VUdDZk16zDOVug==",
+    "linkify-html": {
+      "version": "4.0.0-beta.5",
+      "resolved": "https://registry.npmjs.org/linkify-html/-/linkify-html-4.0.0-beta.5.tgz",
+      "integrity": "sha512-7upWBgItubM1yQhO1MozvSzl2bCWModOgcc1Wd7kPpndlbR1JxmqH/N0UzmdvX6g0PX0ftnCQdYV4RZHLP9D5g==",
       "requires": {}
     },
+    "linkifyjs": {
+      "version": "4.0.0-beta.5",
+      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.0.0-beta.5.tgz",
+      "integrity": "sha512-j0YWN/Qd9XuReN4QdU/aMNFtfzBzyi1e07FkxEyeRjfxMKpfmMAofNT80q1vgQ4/U0WUZ/73nBOEpjdyfoUhGw=="
+    },
     "load-bmfont": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.1.tgz",
diff --git a/package.json b/package.json
index b92bdf3..ad1d799 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,8 @@
     "formik": "^2.2.9",
     "html-react-parser": "^2.0.0",
     "katex": "^0.15.6",
-    "linkifyjs": "^2.1.9",
+    "linkify-html": "^4.0.0-beta.5",
+    "linkifyjs": "^4.0.0-beta.5",
     "matrix-js-sdk": "^18.1.0",
     "micromark": "^3.0.10",
     "micromark-extension-gfm": "^2.0.1",
diff --git a/src/util/twemojify.jsx b/src/util/twemojify.jsx
index aed8b09..0a4fede 100644
--- a/src/util/twemojify.jsx
+++ b/src/util/twemojify.jsx
@@ -1,7 +1,7 @@
 /* eslint-disable import/prefer-default-export */
 import React, { lazy, Suspense } from 'react';
 
-import linkifyHtml from 'linkifyjs/html';
+import linkifyHtml from 'linkify-html';
 import parse from 'html-react-parser';
 import twemoji from 'twemoji';
 import { sanitizeText } from './sanitize';