Downgraded linkifyjs

Signed-off-by: Ajay Bura <ajbura@gmail.com>

diff --git a/package-lock.json b/package-lock.json
index d954233a8ac7168fab8a0fc93ad9ee36cc411af1..73ec20225f31cdc00fd93c67d1ceeaecd65ea2b5 100644 (file)
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,9 +18,7 @@
         "flux": "^4.0.1",
         "formik": "^2.2.9",
         "html-react-parser": "^1.2.7",
-        "linkify-html": "^3.0.3",
-        "linkify-react": "^3.0.3",
-        "linkifyjs": "^3.0.3",
+        "linkifyjs": "^2.1.9",
         "matrix-js-sdk": "^12.4.1",
         "micromark": "^3.0.3",
         "micromark-extension-gfm": "^1.0.0",
@@ -8707,6 +8705,12 @@
       "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",
@@ -9110,28 +9114,16 @@
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/linkify-html": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkify-html/-/linkify-html-3.0.3.tgz",
-      "integrity": "sha512-yqfeq9WNGXlk36ka8j862D70L2Ddh+wJkExaHsUJTNTL7D5tDFZbLpFrcHGa6Zy3t8Kk/1Edw7WUPyPV09zbXQ==",
-      "peerDependencies": {
-        "linkifyjs": "^3.0.0"
-      }
-    },
-    "node_modules/linkify-react": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkify-react/-/linkify-react-3.0.3.tgz",
-      "integrity": "sha512-CdERZyocGB+2sHYKMKltAWy5TyelgocnMI7SU5vdT0ojtZd1u8sRuntXrxjA3tvgTirtLm2nD7gDdJFaVXvDAw==",
+    "node_modules/linkifyjs": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.9.tgz",
+      "integrity": "sha512-74ivurkK6WHvHFozVaGtQWV38FzBwSTGNmJolEgFp7QgR2bl6ArUWlvT4GcHKbPe1z3nWYi+VUdDZk16zDOVug==",
       "peerDependencies": {
-        "linkifyjs": "^3.0.0",
-        "react": ">= 15.0.0"
+        "jquery": ">= 1.11.0",
+        "react": ">= 0.14.0",
+        "react-dom": ">= 0.14.0"
       }
     },
-    "node_modules/linkifyjs": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-3.0.3.tgz",
-      "integrity": "sha512-ba5opS5wRHSbDC8VaiDdN14nPGm6LqyRsIPQZGG4qXV4scFdrPneT/uoZOaq9QAPBf6W9I9D/6tNSzWH//815Q=="
-    },
     "node_modules/load-bmfont": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.1.tgz",
@@ -22648,6 +22640,12 @@
       "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",
@@ -23002,22 +23000,11 @@
         "computed-style": "~0.1.3"
       }
     },
-    "linkify-html": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkify-html/-/linkify-html-3.0.3.tgz",
-      "integrity": "sha512-yqfeq9WNGXlk36ka8j862D70L2Ddh+wJkExaHsUJTNTL7D5tDFZbLpFrcHGa6Zy3t8Kk/1Edw7WUPyPV09zbXQ==",
-      "requires": {}
-    },
-    "linkify-react": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkify-react/-/linkify-react-3.0.3.tgz",
-      "integrity": "sha512-CdERZyocGB+2sHYKMKltAWy5TyelgocnMI7SU5vdT0ojtZd1u8sRuntXrxjA3tvgTirtLm2nD7gDdJFaVXvDAw==",
-      "requires": {}
-    },
     "linkifyjs": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-3.0.3.tgz",
-      "integrity": "sha512-ba5opS5wRHSbDC8VaiDdN14nPGm6LqyRsIPQZGG4qXV4scFdrPneT/uoZOaq9QAPBf6W9I9D/6tNSzWH//815Q=="
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.9.tgz",
+      "integrity": "sha512-74ivurkK6WHvHFozVaGtQWV38FzBwSTGNmJolEgFp7QgR2bl6ArUWlvT4GcHKbPe1z3nWYi+VUdDZk16zDOVug==",
+      "requires": {}
     },
     "load-bmfont": {
       "version": "1.4.1",

diff --git a/package.json b/package.json
index 41c044ed8c0126b729204043889e7f048932eea2..d53eb98b8b37ee3700974db0fec10136e948e5f4 100644 (file)
--- a/package.json
+++ b/package.json
@@ -24,9 +24,7 @@
     "flux": "^4.0.1",
     "formik": "^2.2.9",
     "html-react-parser": "^1.2.7",
-    "linkify-html": "^3.0.3",
-    "linkify-react": "^3.0.3",
-    "linkifyjs": "^3.0.3",
+    "linkifyjs": "^2.1.9",
     "matrix-js-sdk": "^12.4.1",
     "micromark": "^3.0.3",
     "micromark-extension-gfm": "^1.0.0",

diff --git a/src/app/molecules/message/Message.jsx b/src/app/molecules/message/Message.jsx
index e67da744a116338780ad5d6c214e6eb11fdebc91..4ab0983804a850d3773f22840ff7273385bb3160 100644 (file)
--- a/src/app/molecules/message/Message.jsx
+++ b/src/app/molecules/message/Message.jsx
@@ -3,7 +3,7 @@ import React, { useState, useRef } from 'react';
 import PropTypes from 'prop-types';
 import './Message.scss';
 
-import linkifyHtml from 'linkify-html';
+import linkifyHtml from 'linkifyjs/html';
 import parse from 'html-react-parser';
 import twemoji from 'twemoji';
 import dateFormat from 'dateformat';
@@ -106,8 +106,8 @@ function MessageBody({
   if (typeof body !== 'string') return <div className="message__body">{body}</div>;
 
   let content = isCustomHTML ? sanitizeCustomHtml(body) : body;
-  content = linkifyHtml(content, { target: '_blank', rel: 'noreferrer noopener' });
   if (!isCustomHTML) content = sanitizeText(body);
+  content = linkifyHtml(content, { target: '_blank', rel: 'noreferrer noopener' });
   content = twemoji.parse(content);
 
   const parsed = parse(content);

diff --git a/src/app/molecules/room-intro/RoomIntro.jsx b/src/app/molecules/room-intro/RoomIntro.jsx
index 315d561a87dbf981ef629561f220ac9ae1390998..c71e41e4f314b30fb1b31a5933b603b626b9807c 100644 (file)
--- a/src/app/molecules/room-intro/RoomIntro.jsx
+++ b/src/app/molecules/room-intro/RoomIntro.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './RoomIntro.scss';
 
-import Linkify from 'linkify-react';
+import Linkify from 'linkifyjs/react';
 import colorMXID from '../../../util/colorMXID';
 
 import Text from '../../atoms/text/Text';

diff --git a/src/app/molecules/room-tile/RoomTile.jsx b/src/app/molecules/room-tile/RoomTile.jsx
index 059d6d39bb9aac0f6c445da5de273547057285a9..4e2280602d62003815cbbafd1da9ba0965150fd0 100644 (file)
--- a/src/app/molecules/room-tile/RoomTile.jsx
+++ b/src/app/molecules/room-tile/RoomTile.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './RoomTile.scss';
 
-import Linkify from 'linkify-react';
+import Linkify from 'linkifyjs/react';
 import colorMXID from '../../../util/colorMXID';
 
 import Text from '../../atoms/text/Text';