Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Switch back to upstream Linkify #7677

Merged
merged 3 commits into from
Feb 4, 2022
Merged

Switch back to upstream Linkify #7677

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7497e54
Switch back to upstream Linkify
jryans Jan 31, 2022
0d67454
Linkify upgrade for improved types
jryans Feb 4, 2022
300dafe
Merge remote-tracking branch 'origin/develop' into jryans/linkify-ups…
jryans Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@
},
"dependencies": {
"@babel/runtime": "^7.12.5",
"@matrix-org/linkify-element": "^4.0.0-rc.5",
"@matrix-org/linkify-string": "^4.0.0-rc.5",
"@matrix-org/linkifyjs": "^4.0.0-rc.6",
"@sentry/browser": "^6.11.0",
"@sentry/tracing": "^6.11.0",
"@types/geojson": "^7946.0.8",
Expand Down Expand Up @@ -88,6 +85,9 @@
"is-ip": "^3.1.0",
"jszip": "^3.7.0",
"katex": "^0.12.0",
"linkify-element": "^4.0.0-beta.3",
"linkify-string": "^4.0.0-beta.3",
"linkifyjs": "^4.0.0-beta.3",
"lodash": "^4.17.20",
"maplibre-gl": "^1.15.2",
"matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1",
Expand Down
8 changes: 4 additions & 4 deletions src/linkify-matrix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

import * as linkifyjs from '@matrix-org/linkifyjs';
import linkifyElement from '@matrix-org/linkify-element';
import linkifyString from '@matrix-org/linkify-string';
import * as linkifyjs from 'linkifyjs';
import { registerCustomProtocol, registerPlugin } from 'linkifyjs';
import linkifyElement from 'linkify-element';
import linkifyString from 'linkify-string';
import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
import { registerCustomProtocol, registerPlugin } from '@matrix-org/linkifyjs';

import { baseUrl } from "./utils/permalinks/MatrixToPermalinkConstructor";
import {
Expand Down
30 changes: 15 additions & 15 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1384,21 +1384,6 @@
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.5":
version "4.0.0-rc.5"
resolved "https://registry.yarnpkg.com/@matrix-org/linkify-element/-/linkify-element-4.0.0-rc.5.tgz#0c27e81272638674ba4162fec2fd131b2c36c163"
integrity sha512-6sdJ5x9EZpUNVZqc2Dig8Q4hySdL2fdE/ivehk4L3y3rV7tMD0fRs5rXQQ4wcgCMhGAAGbscbNiS8pyZIy9Hlg==

"@matrix-org/linkify-string@^4.0.0-rc.5":
version "4.0.0-rc.5"
resolved "https://registry.yarnpkg.com/@matrix-org/linkify-string/-/linkify-string-4.0.0-rc.5.tgz#139ba23c70a4f5b531656365a6109c122177b132"
integrity sha512-WFyu6+kVEPJsDwZwgCSrtUDeIMDdWIFzRRq5z+MLYHiO3J8G19jvRjRnNm4dwjDUqROWhvWS9b8JG7rbuwjkLQ==

"@matrix-org/linkifyjs@^4.0.0-rc.6":
version "4.0.0-rc.6"
resolved "https://registry.yarnpkg.com/@matrix-org/linkifyjs/-/linkifyjs-4.0.0-rc.6.tgz#62bce99272e0b2a78896b01651d8b26602247f32"
integrity sha512-RoBejrxlv8jJjaZ9itTx0+JW8ECNEvj7iJzbD1rGhToLZjRZ5qXexWIa3+Vu4qmm+Yic+ETPCSH7odYWSYj/fA==

"@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"
Expand Down Expand Up @@ -5976,6 +5961,21 @@ 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@^4.0.0-beta.3:
version "4.0.0-beta.3"
resolved "https://registry.yarnpkg.com/linkify-element/-/linkify-element-4.0.0-beta.3.tgz#81fac01231a9771f2dcbca5bb1d1054037b3751d"
integrity sha512-Ia7uDNoe//lCV4rhvkCuXvJ5T6lsBxQuzSGYWsy9ccEGNwdwf4xvxm+yAZmwfQZQNhjIDJxyj9sec1HtdhnuMA==

linkify-string@^4.0.0-beta.3:
version "4.0.0-beta.3"
resolved "https://registry.yarnpkg.com/linkify-string/-/linkify-string-4.0.0-beta.3.tgz#a346a994b0208e6fb2244ed6562c45f2dceffe29"
integrity sha512-Uvo4imC91Wnlnmd6gIUm4TTclzHwAVsuJCagUQOWEmXm1/CxYRTHMcBxat6S2+2vR1IZ63rCly/1XRWVmaHDKw==

linkifyjs@^4.0.0-beta.3:
version "4.0.0-beta.3"
resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.0.0-beta.3.tgz#d04fdbafea9968a338e1a6dae37266536d9c911d"
integrity sha512-GpnkXTCt23h4yAbTPCW+ZlGi326+jmVeAolH5mJCHjW8A9OBMY3v07l6RNGL+2U6vxwnNWlgKTvMmQKvUO5fhQ==

loader-utils@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
Expand Down