Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regex: Changed how languages embed regexes #2532

Merged
merged 3 commits into from
Aug 31, 2020

Conversation

RunDevelopment
Copy link
Member

Because of how Regex modified JS, whether JSX got regex highlighting depended on the loading order of JSX and Regex.

This pull fixes this issue by redoing the dependencies around Regex. JS and Vala will now have Regex as an optional dependency. This means that all languages that extend JS will automatically get regex highlighting (if available).

@RunDevelopment RunDevelopment changed the title Regex: Changed with languages embed regexes Regex: Changed how languages embed regexes Aug 31, 2020
Copy link
Member

@mAAdhaTTah mAAdhaTTah left a comment

Choose a reason for hiding this comment

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

This looks good to me but you've got a conflict.

@RunDevelopment
Copy link
Member Author

Regarding conflicts: Most of the conflicts we have are in generated files. These conflicts are trivial to resolve (merge, run npm run build, commit everything), so should I add a little npm script that does this automatically? Might be useful for first-time contributors.

@mAAdhaTTah
Copy link
Member

That would only work if the bot has access to commit to the PR, so we'd need to make sure it's resilient. Maybe we need to consider switching to GitHub actions? That would make some of this stuff easier.

@RunDevelopment
Copy link
Member Author

That sounds a little bit too automated for my taste. I was thinking about a little script I could point to when people have to resolve merge conflicts.

That would make some of this stuff easier.

Yeah, for stuff like automated releases that'd be easier. Should I make a quick PR to move the current Travis pipeline?

(Also, one annoying side of GH actions is that workflows are hard to change. You can't easily make a new branch and change them. GH will reject your push. Pretty annoying but can be worked around.)

@RunDevelopment RunDevelopment merged commit f62ca78 into PrismJS:master Aug 31, 2020
@RunDevelopment RunDevelopment deleted the regex-deps branch August 31, 2020 15:56
quentinvernot pushed a commit to TankerHQ/prismjs that referenced this pull request Sep 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants