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

Fix linkification and bump linkifyjs dep #460

Merged
merged 1 commit into from
Sep 13, 2016

Conversation

aviraldg
Copy link
Contributor

No description provided.

@matrixbot
Copy link
Member

Can one of the admins verify this patch?

@@ -36,7 +36,7 @@
"fuse.js": "^2.2.0",
"glob": "^5.0.14",
"highlight.js": "^8.9.1",
"linkifyjs": "2.0.0-beta.4",
"linkifyjs": "2.1.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the reason this was pinned to that particular version was due to element-hq/element-web#2010 - can you check it doesn't reintroduce that regression?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does, I'll update and revert this change. The actual fix here is to modify the states and transitions used, so that is all that's required.

@ara4n
Copy link
Member

ara4n commented Sep 11, 2016

@dbkr is probably best placed to review this one, as he did the linkify stuff in the first place iirc

@dbkr
Copy link
Member

dbkr commented Sep 12, 2016

@matrixbot test this please

@dbkr
Copy link
Member

dbkr commented Sep 12, 2016

Looks reasonable, assuming this is essentially adding in some extra characters to the set that are matched for aliases and cleaning up the inheritance. Guess we will need to pin the dependency again though.

@dbkr dbkr removed their assignment Sep 12, 2016
@ara4n
Copy link
Member

ara4n commented Sep 13, 2016

i'll merge and re-pin.

@ara4n ara4n merged commit 91b90aa into matrix-org:develop Sep 13, 2016
@ara4n
Copy link
Member

ara4n commented Sep 13, 2016

this broke everything - i assume it's using 2.1.0 specific stuff? reverting...

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants