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

Attempt to merge upstream changes #3

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

mrmanc
Copy link
Member

@mrmanc mrmanc commented Jan 6, 2025

No description provided.

mrmanc and others added 5 commits January 6, 2025 21:45
This was causing issues with Mermaid state diagrams, as the `*` in the start and end nodes (`[*]`) was being interpreted as emphasis (`<em>` tags were finding their way into the DOM). I found inspiration in [this solution](https://revealjs.com/math/#markdown) in the reveal.js docs which uses a single backtick to wrap text in a `<code>` block, which prevents marked (the JS Markdown processor used by reveal.js) from processing the text as markdown. To accommodate this change I’ve tweaked our JS to strip the code tag out of the Mermaid diagram code.

This change may also provide an alternative approach for #35.

I’ve upgraded Mermaid to default to 11.0.2, and users can now override this version in their `config.yml` like this: `mermaid_version: 11.0.2`.

11.0.2 is the most recent which didn’t introduce weird rendering issues with state diagrams which I’ve not spent time investigating.
As far as I can see this code serves no purpose for our use case.
This reverts commit a648f23, reversing
changes made to a2c3b86.

a648f23 was me accidentally merging changes from a downstream repo, and I’m not entirely clear on what went wrong. That will teach me for using the GitHub UI to sync repos. Hopefully this commit undoes the damage, otherwise I’ll have to reset and force push to master  🙈.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant