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

Add hint on "flowchart" and "graph" #4096

Merged
merged 6 commits into from Jun 12, 2023
Merged

Add hint on "flowchart" and "graph" #4096

merged 6 commits into from Jun 12, 2023

Conversation

koppor
Copy link
Contributor

@koppor koppor commented Feb 16, 2023

📑 Summary

This PR changes two things:

Add hint on graph

The documentation on flowcharts uses flowchart

image

When opening the live editor (https://mermaid.live/), it uses graph for a flow chart

image

The documentation contains the hint on graph only in "Other examples":

image

image

Reformat notes

Currently, notes are formatted using **Note:**. According to https://vitepress.vuejs.org/guide/markdown#custom-containers, it is possible to have other stylings:

image

image

This PR uses that for the flowchart description.

📏 Design Decisions

  • Consistency of tooling and documentation
  • Using available styling syntax to provide a nicer rendering

📋 Tasks

Make sure you

  • 📖 have read the contribution guidelines
  • 💻 have added unit/e2e tests (if appropriate)
  • 📓 have added documentation (if appropriate)
  • 🔖 targeted develop branch

@sidharthv96
Copy link
Member

Graph has been replaced with Flowchart in mermaid-js/mermaid-live-editor#654
Also, I just added the formatting rules into Contributing.md 4ed6ec1. Can you please update the PR?

@koppor
Copy link
Contributor Author

koppor commented Apr 5, 2023

Updated 😅

From 4ed6ec1 I see that

```note

is converted to > **Note:**<br> and not ::: note<br>. I assume, this is intended as you aim for a light highlight of that content?

@sidharthv96
Copy link
Member

@koppor it converts based on the output format. Default output is github markdown, which uses the ** syntax.
When building for vitepress, it'll convert to ::: format.

@@ -687,11 +697,13 @@ Starting with Mermaid version 9.4, you can use an alternate renderer named elk.
The _elk_ renderer is an experimenal feature.
You can change the renderer to elk by adding this directive:

```
```elk
Copy link
Member

Choose a reason for hiding this comment

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

This is not elk language.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I know, just rendered more nicely. Hack removed.

@koppor
Copy link
Contributor Author

koppor commented Jun 12, 2023

@sidharthv96 I resolved the conflicts again. Should I change something more?

@sidharthv96
Copy link
Member

@koppor we have note, tip, danger and warning.

info is not supported. note will be transformed to info when building the vitepress docs. So, don't worry.

@koppor
Copy link
Contributor Author

koppor commented Jun 12, 2023

@sidharthv96 Fixed.

@sidharthv96 sidharthv96 merged commit 190d796 into mermaid-js:develop Jun 12, 2023
@mermaid-bot
Copy link

mermaid-bot bot commented Jun 12, 2023

@koppor, Thank you for the contribution!
You are now eligible for a year of Premium account on MermaidChart.
Sign up with your GitHub account to activate.

@koppor koppor deleted the patch-1 branch June 12, 2023 08:50
github-merge-queue bot pushed a commit to fuxingloh/contented that referenced this pull request Jul 2, 2023
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [mermaid](https://togithub.com/mermaid-js/mermaid) | [`10.2.3` ->
`10.2.4`](https://renovatebot.com/diffs/npm/mermaid/10.2.3/10.2.4) |
[![age](https://badges.renovateapi.com/packages/npm/mermaid/10.2.4/age-slim)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://badges.renovateapi.com/packages/npm/mermaid/10.2.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://badges.renovateapi.com/packages/npm/mermaid/10.2.4/compatibility-slim/10.2.3)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://badges.renovateapi.com/packages/npm/mermaid/10.2.4/confidence-slim/10.2.3)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>mermaid-js/mermaid (mermaid)</summary>

###
[`v10.2.4`](https://togithub.com/mermaid-js/mermaid/releases/tag/v10.2.4):
10.2.4

[Compare
Source](https://togithub.com/mermaid-js/mermaid/compare/v10.2.3...v10.2.4)

#### Features

- Add Plausible analytics to mermaid.js.org by
[@&#8203;sidharthv96](https://togithub.com/sidharthv96) in
[mermaid-js/mermaid#4473
- Support for development in Docker by
[@&#8203;nirname](https://togithub.com/nirname) in
[mermaid-js/mermaid#4478
- standardize info diagram definitions by
[@&#8203;Yokozuna59](https://togithub.com/Yokozuna59) in
[mermaid-js/mermaid#4486
- Change C4 stereotype braces from ASCII <\</>> to Unicode «/» by
[@&#8203;jonathan-r-young](https://togithub.com/jonathan-r-young) in
[mermaid-js/mermaid#4460
- Add coverage for E2E tests by
[@&#8203;sidharthv96](https://togithub.com/sidharthv96) in
[mermaid-js/mermaid#4498
- set normal mode for vitest coverage by
[@&#8203;Yokozuna59](https://togithub.com/Yokozuna59) in
[mermaid-js/mermaid#4505
- Use v8 coverage in vitest by
[@&#8203;sidharthv96](https://togithub.com/sidharthv96) in
[mermaid-js/mermaid#4560
- feat(flowchart): add classDef style group definition by
[@&#8203;tomperr](https://togithub.com/tomperr) in
[mermaid-js/mermaid#3923
- add cypress coverage clean by
[@&#8203;Yokozuna59](https://togithub.com/Yokozuna59) in
[mermaid-js/mermaid#4556
- fix(class): keep members in namespace classes by
[@&#8203;tomperr](https://togithub.com/tomperr) in
[mermaid-js/mermaid#4532

#### Bugfixes

- Add hint on "flowchart" and "graph" by
[@&#8203;koppor](https://togithub.com/koppor) in
[mermaid-js/mermaid#4096
- fix(flowchart): apply style on doublecircle by
[@&#8203;tomperr](https://togithub.com/tomperr) in
[mermaid-js/mermaid#4540
- fix not rendered style when style is optional by
[@&#8203;Yokozuna59](https://togithub.com/Yokozuna59) in
[mermaid-js/mermaid#4528
- fix(flowchart): allow multiple vertices with style by
[@&#8203;tomperr](https://togithub.com/tomperr) in
[mermaid-js/mermaid#4553

#### Documentation

- change REAMDME.md coverage from coveralls into codecov by
[@&#8203;Yokozuna59](https://togithub.com/Yokozuna59) in
[mermaid-js/mermaid#4507
- Update latest news section by
[@&#8203;huynhicode](https://togithub.com/huynhicode) in
[mermaid-js/mermaid#4468
- Fix link to Tutorials from n00b-overview page by
[@&#8203;Spiderpig86](https://togithub.com/Spiderpig86) in
[mermaid-js/mermaid#4472
- Fix Directives Documentation by
[@&#8203;adamazing](https://togithub.com/adamazing) in
[mermaid-js/mermaid#4475
- Correct "Bronze" spelling in timeline docs by
[@&#8203;adamazing](https://togithub.com/adamazing) in
[mermaid-js/mermaid#4467
- Document recommended file extension and MIME type docs by
[@&#8203;bollwyvl](https://togithub.com/bollwyvl) in
[mermaid-js/mermaid#4485
- Fix typo in quadrant chart documentation by
[@&#8203;tobie](https://togithub.com/tobie) in
[mermaid-js/mermaid#4512
- fix cspell issues in \*.md files by
[@&#8203;Yokozuna59](https://togithub.com/Yokozuna59) in
[mermaid-js/mermaid#4531
- docs: Howto on foreground color on timelines by
[@&#8203;mcbeelen](https://togithub.com/mcbeelen) in
[mermaid-js/mermaid#4524
- Add citation.cff file by
[@&#8203;schackartk](https://togithub.com/schackartk) in
[mermaid-js/mermaid#4521
- Update Tutorials.md by
[@&#8203;ellenealds](https://togithub.com/ellenealds) in
[mermaid-js/mermaid#4539
- Add Standard Notes extension in integrations page by
[@&#8203;nienow](https://togithub.com/nienow) in
[mermaid-js/mermaid#4557
- Fix up Gantt Chart demo by
[@&#8203;AlexMooney](https://togithub.com/AlexMooney) in
[mermaid-js/mermaid#4561

#### Chore

- Update all patch dependencies (patch) by
[@&#8203;renovate](https://togithub.com/renovate) in
[mermaid-js/mermaid#4482
- chore: revise Contributing documentation by
[@&#8203;weedySeaDragon](https://togithub.com/weedySeaDragon) in
[mermaid-js/mermaid#3814
- chore(deps): update all minor dependencies (minor) by
[@&#8203;renovate](https://togithub.com/renovate) in
[mermaid-js/mermaid#4435
- fix(deps): update all patch dependencies (patch) by
[@&#8203;renovate](https://togithub.com/renovate) in
[mermaid-js/mermaid#4510
- fix(deps): update all patch dependencies (patch) by
[@&#8203;renovate](https://togithub.com/renovate) in
[mermaid-js/mermaid#4535
- chore(deps): update dependency eslint-plugin-jsdoc to v46 by
[@&#8203;renovate](https://togithub.com/renovate) in
[mermaid-js/mermaid#4544
- chore(deps): update dependency jsdom to v22 by
[@&#8203;renovate](https://togithub.com/renovate) in
[mermaid-js/mermaid#4546
- chore(deps): update dependency eslint-plugin-unicorn to v47 by
[@&#8203;renovate](https://togithub.com/renovate) in
[mermaid-js/mermaid#4545
- chore(deps): update dependency workbox-window to v7 by
[@&#8203;renovate](https://togithub.com/renovate) in
[mermaid-js/mermaid#4547
- chore(deps): update node.js to v20 by
[@&#8203;renovate](https://togithub.com/renovate) in
[mermaid-js/mermaid#4548
- fix(deps): update all patch dependencies (patch) by
[@&#8203;renovate](https://togithub.com/renovate) in
[mermaid-js/mermaid#4543
- add `Suggested Solutions` field in `bug_report.yml` by
[@&#8203;Yokozuna59](https://togithub.com/Yokozuna59) in
[mermaid-js/mermaid#4541

#### New Contributors

- [@&#8203;Spiderpig86](https://togithub.com/Spiderpig86) made their
first contribution in
[mermaid-js/mermaid#4472
- [@&#8203;adamazing](https://togithub.com/adamazing) made their first
contribution in
[mermaid-js/mermaid#4475
- [@&#8203;koppor](https://togithub.com/koppor) made their first
contribution in
[mermaid-js/mermaid#4096
- [@&#8203;nirname](https://togithub.com/nirname) made their first
contribution in
[mermaid-js/mermaid#4478
- [@&#8203;Yokozuna59](https://togithub.com/Yokozuna59) made their first
contribution in
[mermaid-js/mermaid#4486
- [@&#8203;jonathan-r-young](https://togithub.com/jonathan-r-young) made
their first contribution in
[mermaid-js/mermaid#4460
- [@&#8203;tobie](https://togithub.com/tobie) made their first
contribution in
[mermaid-js/mermaid#4512
- [@&#8203;schackartk](https://togithub.com/schackartk) made their first
contribution in
[mermaid-js/mermaid#4521
- [@&#8203;mcbeelen](https://togithub.com/mcbeelen) made their first
contribution in
[mermaid-js/mermaid#4524
- [@&#8203;ellenealds](https://togithub.com/ellenealds) made their first
contribution in
[mermaid-js/mermaid#4539
- [@&#8203;nienow](https://togithub.com/nienow) made their first
contribution in
[mermaid-js/mermaid#4557
- [@&#8203;AlexMooney](https://togithub.com/AlexMooney) made their first
contribution in
[mermaid-js/mermaid#4561

**Full Changelog**:
mermaid-js/mermaid@v10.2.3...v10.2.4

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/levaintech/contented).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS4xNDQuMiIsInVwZGF0ZWRJblZlciI6IjM1LjE0NC4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
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.

None yet

2 participants