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

Bump the mermaid version to 8.8.0 #3745

Merged
merged 2 commits into from
Sep 22, 2020

Conversation

CalebJohn
Copy link
Collaborator

fixes #3740

An example of the diagrams I tested with

graph LR;
    A-->B;
    A-->C;
    B-->D;
    C-->D;
	D-->E;
	E-->D;
	D-->F;
Loading
sequenceDiagram
    participant Alice
    participant Bob
    Alice->>John: Hello John, how are you?
    loop Healthcheck
        John->>John: Fight against hypochondria
    end
    Note right of John: Rational thoughts <br/>prevail!
    John-->>Alice: Great!
    John->>Bob: How about you?
    Bob-->>John: Jolly good!
Loading
gantt
dateFormat  YYYY-MM-DD
title Adding GANTT diagram to mermaid
excludes weekdays 2014-01-10

section A section
Completed task            :done,    des1, 2014-01-06,2014-01-08
Active task               :active,  des2, 2014-01-09, 3d
Future task               :         des3, after des2, 5d
Future task2               :         des4, after des3, 5d
Loading
classDiagram
Class01 <|-- AveryLongClass : Cool
Class03 *-- Class04
Class05 o-- Class06
Class07 .. Class08
Class09 --> C2 : Where am i?
Class09 --* C3
Class09 --|> Class07
Class07 : equals()
Class07 : Object[] elementData
Class01 : size()
Class01 : int chimp
Class01 : int gorilla
Class08 <--> C2: Cool label
Loading
gitGraph:
options
{
    "nodeSpacing": 150,
    "nodeRadius": 10
}
end
commit
branch newbranch
checkout newbranch
commit
commit
checkout master
commit
commit
merge newbranch
Loading
erDiagram
    CUSTOMER ||--o{ ORDER : places
    ORDER ||--|{ LINE-ITEM : contains
    CUSTOMER }|..|{ DELIVERY-ADDRESS : uses
Loading
journey
    title My working day
    section Go to work
      Make tea: 5: Me
      Go upstairs: 3: Me
      Do work: 1: Me, Cat
    section Go home
      Go downstairs: 5: Me
      Sit down: 5: Me
Loading

@tessus tessus linked an issue Sep 16, 2020 that may be closed by this pull request
@laurent22 laurent22 changed the base branch from dev to release-1.2 September 22, 2020 12:19
@laurent22
Copy link
Owner

Looks good, there was just one conflict which I've fixed.

@laurent22 laurent22 merged commit 7f7e38b into laurent22:release-1.2 Sep 22, 2020
@CalebJohn CalebJohn deleted the bump-mermaid branch September 22, 2020 16:25
@tessus
Copy link
Collaborator

tessus commented Sep 30, 2020

8.8.1 is out with a few bug fixes. Before releasing an official version (not pre-release), we might want to update to 8.8.1.

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.

Mermaid erDiagram not working in Joplin 1.1.1 ERD diagram of mermaid is not rendered
3 participants