update linkify to current v4

package.json

@@ -58,6 +58,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.5",
+    "@matrix-org/linkify-element": "^4.0.0-rc.1",
+    "@matrix-org/linkify-string": "^4.0.0-rc.2",
+    "@matrix-org/linkifyjs": "^4.0.0-rc.1",
     "@sentry/browser": "^6.11.0",
     "@sentry/tracing": "^6.11.0",
     "@types/geojson": "^7946.0.8",
@@ -85,9 +88,6 @@
     "is-ip": "^3.1.0",
     "jszip": "^3.7.0",
     "katex": "^0.12.0",
-    "linkify-element": "^3.0.4",
-    "linkify-string": "^3.0.4",
-    "linkifyjs": "^3.0.5",
     "lodash": "^4.17.20",
     "maplibre-gl": "^1.15.2",
     "matrix-analytics-events": "https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1",

src/linkify-matrix.ts

@@ -15,11 +15,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as linkifyjs from 'linkifyjs';
-import linkifyElement from 'linkify-element';
-import linkifyString from 'linkify-string';
+import * as linkifyjs from '@matrix-org/linkifyjs';
+import linkifyElement from '@matrix-org/linkify-element';
+import linkifyString from '@matrix-org/linkify-string';
 import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
-import { registerCustomProtocol, registerPlugin } from 'linkifyjs';
+import { registerCustomProtocol, registerPlugin } from '@matrix-org/linkifyjs';
 
 //linkifyjs/src/core/fsm
 import { baseUrl } from "./utils/permalinks/MatrixToPermalinkConstructor";
@@ -367,8 +367,8 @@ registerPlugin(Type.UserId, ({ scanner, parser, utils }) => {
     });
 });
 
-registerCustomProtocol("matrix");
-registerPlugin(Type.MatrixURI, matrixURILinkifyParser);
+registerCustomProtocol("matrix", true);
+// registerPlugin(Type.MatrixURI, matrixURILinkifyParser);
 
 export const linkify = linkifyjs;
 export const _linkifyElement = linkifyElement;

yarn.lock

@@ -1384,6 +1384,21 @@
   resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe"
   integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==
 
+"@matrix-org/linkify-element@^4.0.0-rc.1":
+  version "4.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@matrix-org/linkify-element/-/linkify-element-4.0.0-rc.1.tgz#b6355a2ff649b3d7e788c7e9c80b2e23f44a7736"
+  integrity sha512-72G2Vz/5h0YpzhCZnAu/6XuKJSriKQ6DNHyX5p7wAyANC2u/TI4+3Ya6EmxdDvbJHG0Lm0yMqAoErsP0St7U6A==
+
+"@matrix-org/linkify-string@^4.0.0-rc.2":
+  version "4.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@matrix-org/linkify-string/-/linkify-string-4.0.0-rc.2.tgz#2b39d2af4d91d294d8b6663902bda4f9bfa92edb"
+  integrity sha512-noHuFhU+VKR5kJCGwNUKbBcKo4yvS1YaQrtsR+KPKnMcpQrG8xXqyaWExmZKoo+jUjAzN/pcRuJog4bDt3lQWw==
+
+"@matrix-org/linkifyjs@^4.0.0-rc.1":
+  version "4.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@matrix-org/linkifyjs/-/linkifyjs-4.0.0-rc.1.tgz#0117b4e2c9b7e84d5788f4df30e145a9eb57b909"
+  integrity sha512-h9CV8IHJNZL53UDZaxSJpnoDHO04MC1vYGTZwg0hpRE2y29ZQ6NWxdSL8OAy0RNpe4ZMY8yihaDuB4hFS/f0Cw==
+
 "@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz":
   version "3.2.8"
   resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz#8d53636d045e1776e2a2ec6613e57330dd9ce856"
@@ -5968,21 +5983,6 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-linkify-element@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/linkify-element/-/linkify-element-3.0.4.tgz#3566a3b48d4c211a684f42a23a9964bf53f3a31a"
-  integrity sha512-xrj2Upv4/XUxvvczoDwojEnzKnfJCHlorAxYmdFPSGNwLz2sXYkYyB7Lw1flkGS7L0yS0dq/HwOotG0Kpaiaxw==
-
-linkify-string@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/linkify-string/-/linkify-string-3.0.4.tgz#6abf1a5e436e800c729274ae08f5703484647f84"
-  integrity sha512-OnNqqRjlYXaXipIAbBC8sDXsSumI1ftatzFg141Pw9HEXWjTVLFcMZoKbFupshqWRavtNJ6QHLa+u6AlxxgeRw==
-
-linkifyjs@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-3.0.5.tgz#99e51a3a0c0e232fcb63ebb89eea3ff923378f34"
-  integrity sha512-1Y9XQH65eQKA9p2xtk+zxvnTeQBG7rdAXSkUG97DmuI/Xhji9uaUzaWxRj6rf9YC0v8KKHkxav7tnLX82Sz5Fg==
-
 loader-utils@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"