Merge branch 'develop' into develop

2025-09-24 17:59:39 +02:00 · 2020-02-27 00:32:17 -08:00
parent 26c43667aa 737e95c3f9
commit 33ea1d44fb
15 changed files with 437 additions and 124 deletions
--- a/README.md
+++ b/README.md
@@ -5,14 +5,45 @@
 <!-- </Remove this in the future> -->

 # mermaid [![Build Status](https://travis-ci.org/mermaid-js/mermaid.svg?branch=master)](https://travis-ci.org/mermaid-js/mermaid) [![NPM](https://img.shields.io/npm/v/mermaid)](https://www.npmjs.com/package/mermaid) [![Coverage Status](https://coveralls.io/repos/github/mermaid-js/mermaid/badge.svg?branch=master)](https://coveralls.io/github/mermaid-js/mermaid?branch=master) [![Join our Slack!](https://img.shields.io/static/v1?message=join%20chat&color=9cf&logo=slack&label=slack)](https://join.slack.com/t/mermaid-talk/shared_invite/enQtNzc4NDIyNzk4OTAyLWVhYjQxOTI2OTg4YmE1ZmJkY2Y4MTU3ODliYmIwOTY3NDJlYjA0YjIyZTdkMDMyZTUwOGI0NjEzYmEwODcwOTE) [![This project is using Percy.io for visual regression testing.](https://percy.io/static/images/percy-badge.svg)](https://percy.io/Mermaid/mermaid)
+
 <!-- <Main description> -->
 __mermaid is a Javascript based diagramming and charting tool. It generates diagrams flowcharts and more, using markdown-inspired text for ease and speed.__

+Check out the list of [Integrations and Usages of Mermaid](https://github.com/mermaid-js/mermaid/blob/develop/docs/integrations.md)
+
+For more information and help in getting started, please view our [documentation](http://mermaid-js.github.io/mermaid/) and start simplifying yours. Alternatively, you can also play with our [live editor](https://mermaidjs.github.io/mermaid-live-editor/)
+<!-- </Main description> --> 
+
+:trophy: **Mermaid was nominated and won the [JS Open Source Awards (2019)](https://osawards.com/javascript/#nominees) in the category "The most exciting use of technology"!!! Thanks to all involved, people committing pull requests, people answering questions and special thanks to Tyler Long who is helping me maintain the project.**
+
+## New diagrams in 8.4
+
+With version 8.4 class diagrams have got some new features, bug fixes and documentation. Another new feature in 8.4 is the new diagram type, state diagrams.
+
+![Image show the two new diagram types](.docs/img/new-diagrams.png)
+
+## Special note regarding version 8.2
+
+In version 8.2 a security improvement was introduced. A securityLevel configuration was introduced which sets the level of trust to be used on the parsed diagrams.
+
+- **true**: (default) tags in text are encoded, click functionality is disabled
+- false: tags in text are allowed, click functionality is enabled
+
+Closed issues:
+
+⚠️ **Note** : This changes the default behaviour of mermaid so that after upgrade to 8.2, if the securityLevel is not configured, tags in flowcharts are encoded as tags and clicking is prohibited.
+
+If your application is taking resposibility for the diagram source security you can set the securityLevel accordingly. By doing this clicks and tags are again allowed.
+
+```javascript
+mermaidAPI.initialize({
+    securityLevel: 'loose'
+});
+```
+
 For more information and help in getting started, please view our [documentation](http://mermaid-js.github.io/mermaid/) and start simplifying yours. Play with our [live editor](https://mermaidjs.github.io/mermaid-live-editor/) or jump straight to the [installation and usage](http://mermaid-js.github.io/mermaid/#/usage).
 <!-- </Main description> -->

-:trophy: _"The most exciting use of technology"_ - [JS Open Source Awards (2019)](https://osawards.com/javascript/#nominees)
-
 __The following are some examples of the diagrams, charts and graphs that can be made using mermaid and the Markdown-inspired text specific to it. Click here jump into the [text syntax](https://mermaid-js.github.io/mermaid/#/n00b-syntaxReference).__
 <table>
 <!-- <Flowchart> -->
--- a/cypress/integration/rendering/flowchart.spec.js
+++ b/cypress/integration/rendering/flowchart.spec.js
@@ -524,7 +524,8 @@ describe('Flowchart', () => {
      { flowchart: { htmlLabels: false } }
    );
  });
-it('25: Handle link click events (link, anchor, mailto, other protocol, script)', () => {
+
+  it('25: Handle link click events (link, anchor, mailto, other protocol, script)', () => {
    imgSnapshotTest(
      `graph TB
      TITLE["Link Click Events<br>(click the nodes below)"]
@@ -583,6 +584,39 @@ it('25: Handle link click events (link, anchor, mailto, other protocol, script)'
      { flowchart: { htmlLabels: false } }
    );
  });
+
+  it('28: Apply default class to all nodes which do not have another class assigned (htmlLabels enabled)', () => {
+    imgSnapshotTest(
+      `graph TD
+      A[myClass1] --> B[default] & C[default]
+      B[default] & C[default] --> D[myClass2]
+      classDef default stroke-width:2px,fill:none,stroke:silver
+      classDef node color:red
+      classDef myClass1 color:#0000ff
+      classDef myClass2 stroke:#0000ff,fill:#ccccff
+      class A myClass1
+      class D myClass2
+      `,
+      { flowchart: { htmlLabels: true } }
+    );
+  });
+
+  it('29: Apply default class to all nodes which do not have another class assigned (htmlLabels disabled)', () => {
+    imgSnapshotTest(
+      `graph TD
+      A[myClass1] --> B[default] & C[default]
+      B[default] & C[default] --> D[myClass2]
+      classDef default stroke-width:2px,fill:none,stroke:silver
+      classDef node color:red
+      classDef myClass1 color:#0000ff
+      classDef myClass2 stroke:#0000ff,fill:#ccccff
+      class A myClass1
+      class D myClass2
+      `,
+      { flowchart: { htmlLabels: false } }
+    );
+  });
+
  it('30: Possibility to style text color of nodes and subgraphs as well as apply classes to subgraphs', () => {
    imgSnapshotTest(
      `graph LR
--- a/dist/index.html
+++ b/dist/index.html
@@ -384,6 +384,17 @@ graph TB
    click B "index.html#link-clicked" "link test"
    click D testClick "click test"
  </div>
+  <div class="mermaid">
+    graph TD
+    A[myClass1] --> B[default] & C[default]
+    B[default] & C[default] --> D[myClass2]
+    classDef default stroke-width:2px,fill:none,stroke:silver
+    classDef node color:red
+    classDef myClass1 color:#0000ff
+    classDef myClass2 stroke:#0000ff,fill:#ccccff
+    class A myClass1
+    class D myClass2
+  </div>

  <hr/>

--- a/docs/README.md
+++ b/docs/README.md
@@ -1,38 +1,9 @@
+# Mermaid
+
 [![Build Status](https://travis-ci.org/mermaid-js/mermaid.svg?branch=master)](https://travis-ci.org/mermaid-js/mermaid)
 [![Coverage Status](https://coveralls.io/repos/github/knsv/mermaid/badge.svg?branch=master)](https://coveralls.io/github/knsv/mermaid?branch=master)
 [![Join the chat at https://gitter.im/knsv/mermaid](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/knsv/mermaid?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

-# mermaid
-
-## New diagrams in 8.4
-
-With version 8.4 class diagrams has got some new features, bug fixes and documentation. Another new feature in 8.4 is the new diagram
-type, state diagrams.
-
-![Image show the two new diagram types](./img/new-diagrams.png)
-
-
-## Special note regarding version 8.2
-
-In version 8.2 a security improvement was introduced. A securityLevel configuration was introduced which sets the level of trust to be used on the parsed diagrams.
-
-* **true**: (default) tags in text are encoded, click functionality is disabled
-* false: tags in text are allowed, click functionality is enabled
-
-Closed issues:
-
-⚠️ **Note** : This changes the default behaviour of mermaid so that after upgrade to 8.2, if the securityLevel is not configured, tags in flowcharts are encoded as tags and clicking is prohibited.
-
-If your application is taking resposibility for the diagram source security you can set the securityLevel accordingly. By doing this clicks and tags are again allowed.
-
-```javascript
-    mermaidAPI.initialize({
-        securityLevel: 'loose'
-    });
-```
-
-**🖖 Keep a steady pulse: mermaid needs more Collaborators [#866](https://github.com/knsv/mermaid/issues/866)**
-
 ![banner](./img/header.png)

 Generation of diagrams and flowcharts from text in a similar manner as markdown.
@@ -41,8 +12,39 @@ Ever wanted to simplify documentation and avoid heavy tools like Visio when expl

 This is why mermaid was born, a simple markdown-like script language for generating charts from text via javascript.

+Check out the list of [Integrations and Usages of Mermaid](./integrations.md)
+
 **Mermaid was nominated and won the JS Open Source Awards (2019) in the category "The most exciting use of technology"!!! Thanks to all involved, people committing pull requests, people answering questions and special thanks to Tyler Long who is helping me maintain the project.**

+## New diagrams in 8.4
+
+With version 8.4 class diagrams have got some new features, bug fixes and documentation. Another new feature in 8.4 is the new diagram type, state diagrams.
+
+![Image show the two new diagram types](./img/new-diagrams.png)
+
+## Special note regarding version 8.2
+
+In version 8.2 a security improvement was introduced. A securityLevel configuration was introduced which sets the level of trust to be used on the parsed diagrams.
+
+- **true**: (default) tags in text are encoded, click functionality is disabled
+- false: tags in text are allowed, click functionality is enabled
+
+Closed issues:
+
+⚠️ **Note** : This changes the default behaviour of mermaid so that after upgrade to 8.2, if the securityLevel is not configured, tags in flowcharts are encoded as tags and clicking is prohibited.
+
+If your application is taking resposibility for the diagram source security you can set the securityLevel accordingly. By doing this clicks and tags are again allowed.
+
+```javascript
+mermaidAPI.initialize({
+    securityLevel: 'loose'
+});
+```
+
+**🖖 Keep a steady pulse: mermaid needs more Collaborators [#866](https://github.com/knsv/mermaid/issues/866)**
+
+## Diagrams
+
 ### Flowchart

 ```
@@ -52,8 +54,8 @@ graph TD;
    B-->D;
    C-->D;
 ```
-![Flowchart](./img/flow.png)

+![Flowchart](./img/flow.png)

 ### Sequence diagram

@@ -70,8 +72,8 @@ sequenceDiagram
    John->>Bob: How about you?
    Bob-->>John: Jolly good!
 ```
-![Sequence diagram](./img/sequence.png)

+![Sequence diagram](./img/sequence.png)

 ### Gantt diagram

@@ -87,8 +89,8 @@ Active task               :active,  des2, 2014-01-09, 3d
 Future task               :         des3, after des2, 5d
 Future task2               :         des4, after des3, 5d
 ```
-![Gantt diagram](./img/gantt.png)

+![Gantt diagram](./img/gantt.png)

 ### Class diagram - :exclamation: experimental

@@ -108,8 +110,8 @@ Class01 : int chimp
 Class01 : int gorilla
 Class08 <--> C2: Cool label
 ```
-![Class diagram](./img/class.png)

+![Class diagram](./img/class.png)

 ### Git graph - :exclamation: experimental

@@ -135,7 +137,6 @@ merge newbranch

 ![Git graph](./img/git.png)

-
 ## Installation

 ### CDN
@@ -154,12 +155,10 @@ Example: https://unpkg.com/mermaid@7.1.0/dist/
 yarn add mermaid
 ```

-
 ## Documentation

 https://mermaidjs.github.io

-
 ## Sibling projects

 - [mermaid CLI](https://github.com/mermaidjs/mermaid.cli)
@@ -167,8 +166,7 @@ https://mermaidjs.github.io
 - [mermaid webpack demo](https://github.com/mermaidjs/mermaid-webpack-demo)
 - [mermaid Parcel demo](https://github.com/mermaidjs/mermaid-parcel-demo)

-
-# Request for assistance
+## Request for assistance

 Things are piling up and I have a hard time keeping up. To remedy this
 it would be great if we could form a core team of developers to cooperate
@@ -178,61 +176,62 @@ As part of this team you would get write access to the repository and would
 represent the project when answering questions and issues.

 Together we could continue the work with things like:
-* adding more types of diagrams like mindmaps, ert diagrams, etc.
-* improving existing diagrams
+
+- Adding more types of diagrams like mindmaps, ert diagrams, etc.
+- Improving existing diagrams

 Don't hesitate to contact me if you want to get involved.

+## For contributors

-# For contributors
+### Setup

-## Setup
+```
+yarn install
+```

-    yarn install
+### Build

+```
+yarn build:watch
+```

-## Build
+### Lint

-    yarn build:watch
-
-
-## Lint
-
-    yarn lint
+```
+yarn lint
+```

 We use [eslint](https://eslint.org/).
 We recommend you installing [editor plugins](https://eslint.org/docs/user-guide/integrations) so you can get real time lint result.

+### Test

+```
+yarn test
+```
+Manual test in browser: open `dist/index.html`

-## Test
-
-    yarn test
-
-Manual test in browser:
-
-    open dist/index.html
-
-
-## Release
+### Release

 For those who have the permission to do so:

 Update version number in `package.json`.

-    npm publish
+```
+npm publish
+```

 Command above generates files into the `dist` folder and publishes them to npmjs.org.

-
-# Credits
+## Credits

 Many thanks to the [d3](http://d3js.org/) and [dagre-d3](https://github.com/cpettitt/dagre-d3) projects for providing the graphical layout and drawing libraries!

 Thanks also to the [js-sequence-diagram](http://bramp.github.io/js-sequence-diagrams) project for usage of the grammar for the sequence diagrams. Thanks to Jessica Peter for inspiration and starting point for gantt rendering.

-*Mermaid was created by Knut Sveidqvist for easier documentation.*
+_Mermaid was created by Knut Sveidqvist for easier documentation._

-*[Tyler Long](https://github.com/tylerlong) has became a collaborator since April 2017.*
+_[Tyler Long](https://github.com/tylerlong) has became a collaborator since April 2017._

 Here is the full list of the projects [contributors](https://github.com/knsv/mermaid/graphs/contributors).
--- a/docs/development.md
+++ b/docs/development.md
@@ -3,9 +3,31 @@

 ## Updating the documentation

-We write documention with GitBook.
+Please continue writing documentation at [mermaid-js/mermaid/docs](https://github.com/mermaid-js/mermaid/tree/develop/docs).

-Please continue with the [mermaid-gitbook](https://github.com/mermaidjs/mermaid-gitbook) project.
+We publish documentation using GitHub Pages.
+
+
+### Questions and/or suggestions ?
+After logging in at [GitHub.com](https://www.github.com), open or append to an issue [using the GitHub issue tracker of the mermaid-js repository](https://github.com/mermaid-js/mermaid/issues?q=is%3Aissue+is%3Aopen+label%3A%22Area%3A+Documentation%22).
+
+### How to contribute a suggestion
+Markdown is used to format the text, for more information about Markdown [see the GitHub Markdown help page](https://help.github.com/en/github/writing-on-github/basic-writing-and-formatting-syntax).
+
+If you want to use an editor on your own computer, you may follow these steps:
+* Find the Markdown file (.md) to edit in the [mermaid-js/mermaid/docs](https://github.com/mermaid-js/mermaid/tree/develop/docs) directory on the develop branch.
+* Create a fork of the develop branch.
+* Make changes or add new documentation.
+* Commit changes to your fork and push it to GitHub.
+* Create a pull request of your fork.
+
+If you don't have such editor on your computer, you may follow these steps:
+* Login at [GitHub.com](https://www.github.com).
+* Navigate to [mermaid-js/mermaid/docs](https://github.com/mermaid-js/mermaid/tree/develop/docs).
+* To edit a file, click the pencil icon at the top-right of the file contents panel.
+* Describe what you changed in the "Propose file change" section, located at the bottom of the page.
+* Submit your changes by clicking the button "Propose file change" at the bottom (by automatic creation of a fork and a new branch).
+* Create a pull request of your newly forked branch, by clicking the green "Create pull request" button.


 ## How to add a new diagram type
--- a/docs/integrations.md
+++ b/docs/integrations.md
@@ -0,0 +1,135 @@
+# Integrations
+
+The following is a list of different integrations and plugins where mermaid is being used
+
+## Productivity
+
+- [GitLab](https://docs.gitlab.com/ee/user/markdown.html#diagrams-and-flowcharts) (**Native support**)
+- [GitHub](https://github.com)
+  - [Github action: Compile mermaid to image](https://github.com/neenjaw/compile-mermaid-markdown-action)
+  - [svg-generator](https://github.com/SimonKenyonShepard/mermaidjs-github-svg-generator)
+- [GitBook](http://gitbook.com)
+  - [Mermaid Plugin](https://github.com/JozoVilcek/gitbook-plugin-mermaid)
+  - [Markdown with Mermaid CLI](https://github.com/miao1007/gitbook-plugin-mermaid-cli)
+  - [Mermaid plugin for GitBook](https://github.com/wwformat/gitbook-plugin-mermaid-pdf)
+- [Atlassian Products](https://www.atlassian.com)
+  - [Mermaid Plugin for Confluence](https://marketplace.atlassian.com/apps/1214124/mermaid-plugin-for-confluence?hosting=server&tab=overview)
+  - [CloudScript.io Addon](https://marketplace.atlassian.com/apps/1219878/cloudscript-io-mermaid-addon?hosting=cloud&tab=overview)
+  - [Auto convert diagrams in Jira](https://github.com/coddingtonbear/jirafs-mermaid)
+- [Redmine](https://redmine.org)
+  - [Mermaid Macro](https://www.redmine.org/plugins/redmine_mermaid_macro)
+  - [redmine-mermaid](https://github.com/styz/redmine_mermaid)
+  - [markdown-for-mermaid-plugin](https://github.com/jamieh-mongolian/markdown-for-mermaid-plugin)
+
+## Blogs
+
+- [Wordpress](https://wordpress.org)
+  - [WordPress Markdown Editor](https://wordpress.org/plugins/wp-githuber-md)
+  - [WP-ReliableMD](https://wordpress.org/plugins/wp-reliablemd/)
+- [Hexo](https://hexo.io)
+  - [hexo-filter-mermid-diagrams](https://github.com/webappdevelp/hexo-filter-mermaid-diagrams)
+  - [hexo-tag-mermaid](https://github.com/JameChou/hexo-tag-mermaid)
+  - [hexo-mermaid-diagrams](https://github.com/mslxl/hexo-mermaid-diagrams)
+
+## CMS
+
+- [VuePress](https://vuepress.vuejs.org/)
+  - [Plugin for Mermaid.js](https://github.com/eFrane/vuepress-plugin-mermaidjs)
+  - [vuepress-plugin-mermaidjs-cli](https://github.com/gwleclerc/vuepress-plugin-mermaidjs-cli)
+- [Grav CMS](https://getgrav.org/)
+  - [Mermaid Diagrams](https://github.com/DanielFlaum/grav-plugin-mermaid-diagrams)
+  - [Gitlab Markdown Adapter](https://github.com/Goutte/grav-plugin-gitlab-markdown-adapter)
+
+## Communication
+
+- [Discourse](https://discourse.org)
+  - [Mermaid Plugin](https://github.com/pnewell/discourse-mermaid), [And](https://github.com/unfoldingWord-dev/discourse-mermaid)
+- [Mattermost](https://mattermost.com/)
+  - [Mermaid Plugin](https://github.com/SpikeTings/Mermaid)
+- [phpBB](https://phpbb.com)
+  - [phpbb-ext-mermaid](https://github.com/AlfredoRamos/phpbb-ext-mermaid)
+- [NodeBB](https://nodebb.org)
+  - [Mermaid Plugin](https://www.npmjs.com/package/nodebb-plugin-mermaid)
+
+## Wikis
+
+- [Media Wiki](https://www.mediawiki.org/wiki/Extension:Mermaid)
+- [Semantic Media Wiki](https://semantic-mediawiki.org)
+  - [Mermaid Plugin](https://github.com/SemanticMediaWiki/Mermaid)
+- [FosWiki](https://foswiki.org)
+  - [Mermaid Plugin](https://foswiki.org/Extensions/MermaidPlugin)
+- [DokuWiki](https://dokuwiki.org)
+  - [Flowcharts](https://www.dokuwiki.org/plugin:flowcharts?s[]=mermaid)
+- [TiddlyWiki](https://tiddlywiki.com/)
+  - [mermaid-tw5-plugin](https://github.com/michaeljmcd/mermaid-tw5-plugin)
+
+## Editor Plugins
+
+- [Vs Code](https://code.visualstudio.com/)
+  - [Markdown Preview Mermaid Support](https://marketplace.visualstudio.com/items?itemName=bierner.markdown-mermaid)
+  - [Mermaid Preview](https://marketplace.visualstudio.com/items?itemName=vstirbu.vscode-mermaid-preview)
+  - [Mermaid Markdown Syntax Highlighting](https://marketplace.visualstudio.com/items?itemName=bpruitt-goddard.mermaid-markdown-syntax-highlighting)
+  - [Mermaid Editor](https://marketplace.visualstudio.com/items?itemName=tomoyukim.vscode-mermaid-editor)
+  - [Mermaid Export](https://marketplace.visualstudio.com/items?itemName=Gruntfuggly.mermaid-export)
+  - [Markdown PDF](https://marketplace.visualstudio.com/items?itemName=yzane.markdown-pdf)
+  - [Preview](https://marketplace.visualstudio.com/items?itemName=searKing.preview-vscode)
+  - [Preview Sequence Diagrams](https://marketplace.visualstudio.com/items?itemName=arichika.previewseqdiag-vscode)
+- [Markdown-It](https://github.com/markdown-it/markdown-it)
+  - [Textual UML Parser](https://github.com/manastalukdar/markdown-it-textual-uml)
+  - [Mermaid Plugin](https://github.com/tylingsoft/markdown-it-mermaid)
+  - [md-it-mermaid](https://github.com/iamcco/md-it-mermaid)
+  - [markdown-it-mermaid-fence-new](https://github.com/Revomatico/markdown-it-mermaid-fence-new)
+  - [markdown-it-mermaid-less](https://github.com/searKing/markdown-it-mermaid-less)
+- [Atom](https://atom.io)
+  - [Markdown Preview Enhanced](https://atom.io/packages/markdown-preview-enhanced)
+  - [Atom Mermaid](https://atom.io/packages/atom-mermaid)
+  - [Language Mermaid Syntax Highlighter](https://atom.io/packages/language-mermaid)
+- [Sublime Text 3](https://sublimetext.com)
+  - [Mermaid Package](https://packagecontrol.io/packages/Mermaid)
+- [Astah](http://astah.net)
+  - [Export to Mermaid](https://github.com/Avens666/Astah_Jude_UML_export_to_Markdown-mermaid-Plantuml-)
+- [Light Table](http://lighttable.com/)
+  - [Mermaid Plugin](https://github.com/cldwalker/Mermaid)
+- [Draw.io](http://draw.io) - [Plugin](https://github.com/nopeslide/drawio_mermaid_plugin)
+- [Inkdrop](http://inkdrop.app) - [Plugin](https://github.com/inkdropapp/inkdrop-mermaid)
+- [Vim](https://vim.org)
+  - [Vim Diagram Syntax](https://github.com/zhaozg/vim-diagram)
+- [Brackets](http://brackets.io/)
+  - [Mermaid Preview](https://s3.amazonaws.com/extend.brackets/alanhohn.mermaid-preview/alanhohn.mermaid-preview-1.0.2.zip)
+- [Iodide](https://github.com/iodide-project/iodide)
+  - [iodide-mermaid-plugin](https://github.com/iodide-project/iodide-mermaid-plugin)
+
+## Document Generation
+
+- [Sphinx](https://www.sphinx-doc.org/en/master/)
+  - [sphinxcontrib-mermaid](https://github.com/mgaitan/sphinxcontrib-mermaid)
+- [remark.js](https://remark.js.org/)
+  - [remark-mermaid](https://github.com/temando/remark-mermaid)
+- [jSDoc](https://jsdoc.app/)
+  - [jsdoc-mermaid](https://github.com/Jellyvision/jsdoc-mermaid)
+- [MkDocs](https://mkdocs.org)
+  - [MarkdownMermaid](https://github.com/pugong/mkdocs-mermaid-plugin)
+- [Type Doc](https://typedoc.org/)
+  - [typedoc-plugin-mermaid](https://www.npmjs.com/package/typedoc-plugin-mermaid)
+
+## Chrome Extensions
+
+- [Mermaid Diagrams](https://chrome.google.com/webstore/detail/mermaid-diagrams/phfcghedmopjadpojhmmaffjmfiakfil)
+- [GitHub + Mermaid](https://chrome.google.com/webstore/detail/github-%2B-mermaid/goiiopgdnkogdbjmncgedmgpoajilohe)
+- [Mermaid Markdown](https://chrome.google.com/webstore/detail/mermaid-markdown/mboeoikjijmjcjgpccghbcoegikliijg)
+- [Monkeys](https://chrome.google.com/webstore/detail/monkeys-mermaid-for-githu/cplfdpoajbclbgphaphphcldamfkjlgi)
+- [Asciidoctor Live Preview](https://chrome.google.com/webstore/detail/asciidoctorjs-live-previe/iaalpfgpbocpdfblpnhhgllgbdbchmia) __works in the new IE as well__
+- [Chrome Diagrammer](https://chrome.google.com/webstore/detail/chrome-diagrammer/bkpbgjmkomfoakfklcjeoegkklgjnnpk)
+- [Diagram Tab](https://github.com/khafast/diagramtab)
+
+## Other
+
+- [Jekyll](https://jekyllrb.com/)
+  - [jekyll-mermaid](https://rubygems.org/gems/jekyll-mermaid)
+  - [jekyll-mermaid-diagrams](https://github.com/fuzhibo/jekyll-mermaid-diagrams)
+- [Reveal.js](https://github.com/hakimel/reveal.js)
+  - [reveal.js-mermaid-plugin](https://github.com/ludwick/reveal.js-mermaid-plugin)
+- [Bisheng](https://www.npmjs.com/package/bisheng)
+  - [bisheng-plugin-mermaid](https://github.com/yct21/bisheng-plugin-mermaid)
+- [Reveal CK](https://github.com/jedcn/reveal-ck)
+  - [reveal-ck-mermaid-plugin](https://github.com/tmtm/reveal-ck-mermaid-plugin)
--- a/docs/sequenceDiagram.md
+++ b/docs/sequenceDiagram.md
@@ -77,7 +77,6 @@ Type | Description
 -x   | Solid line with a cross at the end (async)
 --x  | Dotted line with a cross at the end (async)

-
 ## Activations

 It is possible to activate and deactivate an actor. (de)activation can be dedicated declarations:
@@ -127,7 +126,6 @@ sequenceDiagram
    John-->>-Alice: I feel great!
 ```

-
 ## Notes

 It is possible to add notes to a sequence diagram. This is done by the notation
@@ -159,7 +157,6 @@ sequenceDiagram
    Note over Alice,John: A typical interaction
 ```

-
 ## Loops

 It is possible to express loops in a sequence diagram. This is done by the notation
@@ -187,7 +184,6 @@ sequenceDiagram
    end
 ```

-
 ## Alt

 It is possible to express alternative paths in a sequence diagram. This is done by the notation
@@ -235,7 +231,53 @@ sequenceDiagram
    end
 ```

+## Parallel
+
+It is possible to show actions that are happening in parallel.
+
+This is done by the notation
+
+```
+par [Action 1]
+... statements ...
+and [Action 2]
+... statements ...
+and [Action N]
+... statements ...
+end
+```
+
+See the example below:
+
+```mermaid
+sequenceDiagram
+    par Alice to Bob
+        Alice->>Bob: Hello guys!
+    and Alice to John
+        Alice->>John: Hello guys!
+    end
+    Bob-->>Alice: Hi Alice!
+    John-->>Alice: Hi Alice!
+```
+
+It is also possible to nest parallel blocks.
+
+```mermaid
+sequenceDiagram
+    par Alice to Bob
+        Alice->>Bob: Go help John
+    and Alice to John
+        Alice->>John: I want this done today
+        par John to Charlie
+            John->>Charlie: Can we do this today?
+        and John to Diana
+            John->>Diana: Can you help us today?
+        end
+    end
+```
+
 ## Background Highlighting
+
 It is possible to highlight flows by providing colored background rects. This is done by the notation

 The colors are defined using rgb and rgba syntax.
@@ -284,7 +326,7 @@ sequenceDiagram

 ## sequenceNumbers

-It is possiebl to get a sequence number attached to each arrow in a sequence diagram. This can be configured when adding mermaid to the website as shown below:
+It is possible to get a sequence number attached to each arrow in a sequence diagram. This can be configured when adding mermaid to the website as shown below:
 ```
    <script>
      mermaid.initialize({
@@ -340,10 +382,8 @@ loopLine     | Defines styles for the lines in the loop box.
 note         | Styles for the note box.
 noteText     | Styles for the text on in the note boxes.

-
 ### Sample stylesheet

-
 ```css
 body {
    background: white;
@@ -426,7 +466,6 @@ text.actor {
 }
 ```

-
 ## Configuration

 Is it possible to adjust the margins for rendering the sequence diagram.
@@ -452,4 +491,3 @@ Param | Description | Default value
 --- | --- | ---
 mirrorActor | Turns on/off the rendering of actors below the diagram as well as above it | false
 bottomMarginAdj | Adjusts how far down the graph ended. Wide borders styles with css could generate unwanted clipping which is why this config param exists. | 1
-
--- a/src/diagrams/class/classDb.js
+++ b/src/diagrams/class/classDb.js
@@ -1,6 +1,7 @@
 import * as d3 from 'd3';
 import { logger } from '../../logger';
 import { getConfig } from '../../config';
+import common from '../common/common';
 import utils from '../../utils';

 const MERMAID_DOM_ID_PREFIX = 'classid-';
@@ -175,7 +176,7 @@ export const setLink = function(ids, linkStr, tooltip) {
      classes[id].link = utils.formatUrl(linkStr, config);

      if (tooltip) {
-        classes[id].tooltip = utils.sanitize(tooltip, config);
+        classes[id].tooltip = common.sanitizeText(tooltip, config);
      }
    }
  });
@@ -207,7 +208,7 @@ const setClickFunc = function(domId, functionName, tooltip) {
  }
  if (typeof classes[id] !== 'undefined') {
    if (tooltip) {
-      classes[id].tooltip = utils.sanitize(tooltip, config);
+      classes[id].tooltip = common.sanitizeText(tooltip, config);
    }

    funs.push(function() {
--- a/src/diagrams/common/common.js
+++ b/src/diagrams/common/common.js
@@ -0,0 +1,39 @@
+export const getRows = s => {
+  if (!s) return 1;
+  let str = breakToPlaceholder(s);
+  str = str.replace(/\\n/g, '#br#');
+  return str.split('#br#');
+};
+
+export const sanitizeText = (text, config) => {
+  let txt = text;
+  let htmlLabels = true;
+  if (
+    config.flowchart &&
+    (config.flowchart.htmlLabels === false || config.flowchart.htmlLabels === 'false')
+  )
+    htmlLabels = false;
+
+  if (config.securityLevel !== 'loose' && htmlLabels) {
+    // eslint-disable-line
+    txt = breakToPlaceholder(txt);
+    txt = txt.replace(/</g, '&lt;').replace(/>/g, '&gt;');
+    txt = txt.replace(/=/g, '&equals;');
+    txt = placeholderToBreak(txt);
+  }
+
+  return txt;
+};
+
+const breakToPlaceholder = s => {
+  return s.replace(/<br\s*\/?>/gi, '#br#');
+};
+
+const placeholderToBreak = s => {
+  return s.replace(/#br#/g, '<br/>');
+};
+
+export default {
+  getRows,
+  sanitizeText
+};
--- a/src/diagrams/flowchart/flowDb.js
+++ b/src/diagrams/flowchart/flowDb.js
@@ -2,6 +2,7 @@ import * as d3 from 'd3';
 import { logger } from '../../logger';
 import utils from '../../utils';
 import { getConfig } from '../../config';
+import common from '../common/common';

 // const MERMAID_DOM_ID_PREFIX = 'mermaid-dom-id-';
 const MERMAID_DOM_ID_PREFIX = '';
@@ -43,7 +44,7 @@ export const addVertex = function(_id, text, type, style, classes) {
    vertices[id] = { id: id, styles: [], classes: [] };
  }
  if (typeof text !== 'undefined') {
-    txt = utils.sanitize(text.trim(), config);
+    txt = common.sanitizeText(text.trim(), config);

    // strip quotes if string starts and ends with a quote
    if (txt[0] === '"' && txt[txt.length - 1] === '"') {
@@ -93,7 +94,7 @@ export const addSingleLink = function(_start, _end, type, linktext) {
  linktext = type.text;

  if (typeof linktext !== 'undefined') {
-    edge.text = utils.sanitize(linktext.trim(), config);
+    edge.text = common.sanitizeText(linktext.trim(), config);

    // strip quotes if string starts and exnds with a quote
    if (edge.text[0] === '"' && edge.text[edge.text.length - 1] === '"') {
@@ -210,7 +211,7 @@ export const setClass = function(ids, className) {
 const setTooltip = function(ids, tooltip) {
  ids.split(',').forEach(function(id) {
    if (typeof tooltip !== 'undefined') {
-      tooltips[id] = utils.sanitize(tooltip, config);
+      tooltips[id] = common.sanitizeText(tooltip, config);
    }
  });
 };
@@ -410,7 +411,7 @@ export const addSubGraph = function(_id, list, _title) {
  id = id || 'subGraph' + subCount;
  if (id[0].match(/\d/)) id = MERMAID_DOM_ID_PREFIX + id;
  title = title || '';
-  title = utils.sanitize(title, config);
+  title = common.sanitizeText(title, config);
  subCount = subCount + 1;
  const subGraph = { id: id, nodes: nodeList, title: title.trim(), classes: [] };
  subGraphs.push(subGraph);
--- a/src/diagrams/flowchart/flowRenderer.js
+++ b/src/diagrams/flowchart/flowRenderer.js
@@ -36,7 +36,7 @@ export const addVertices = function(vert, g, svgId) {
     * Variable for storing the classes for the vertex
     * @type {string}
     */
-    let classStr = '';
+    let classStr = 'default';
    if (vertex.classes.length > 0) {
      classStr = vertex.classes.join(' ');
    }
--- a/src/diagrams/flowchart/flowRenderer.spec.js
+++ b/src/diagrams/flowchart/flowRenderer.spec.js
@@ -127,6 +127,40 @@ describe('the flowchart renderer', function() {
        expect(addedNodes[0][1]).toHaveProperty('labelStyle', expectedLabelStyle);
      });
    });
+
+    it(`should add default class to all nodes which do not have another class assigned`, function() {
+      const addedNodes = [];
+      const mockG = {
+        setNode: function(id, object) {
+          addedNodes.push([id, object]);
+        }
+      };
+      addVertices(
+        {
+          v1: {
+            type: 'rect',
+            id: 'defaultNode',
+            classes: [],
+            styles: [],
+            text: 'my vertex text'
+          },
+          v2: {
+            type: 'rect',
+            id: 'myNode',
+            classes: ['myClass'],
+            styles: [],
+            text: 'my vertex text'
+          }
+        },
+        mockG,
+        'svg-id'
+      );
+      expect(addedNodes).toHaveLength(2);
+      expect(addedNodes[0][0]).toEqual('defaultNode');
+      expect(addedNodes[0][1]).toHaveProperty('class', 'default');
+      expect(addedNodes[1][0]).toEqual('myNode');
+      expect(addedNodes[1][1]).toHaveProperty('class', 'myClass');
+    });
  });

  describe('when adding edges to a graph', function() {
--- a/src/diagrams/state/shapes.js
+++ b/src/diagrams/state/shapes.js
@@ -2,6 +2,7 @@ import * as d3 from 'd3';
 import idCache from './id-cache.js';
 import stateDb from './stateDb';
 import utils from '../../utils';
+import common from '../common/common';
 import { getConfig } from '../../config';

 // let conf;
@@ -391,12 +392,6 @@ export const drawState = function(elem, stateDef) {
  return stateInfo;
 };

-const getRows = s => {
-  let str = s.replace(/<br\s*\/?>/gi, '#br#');
-  str = str.replace(/\\n/g, '#br#');
-  return str.split('#br#');
-};
-
 let edgeCount = 0;
 export const drawEdge = function(elem, path, relation) {
  const getRelationType = function(type) {
@@ -455,7 +450,7 @@ export const drawEdge = function(elem, path, relation) {

    const { x, y } = utils.calcLabelPosition(path.points);

-    const rows = getRows(relation.title);
+    const rows = common.getRows(relation.title);

    // console.warn(rows);

--- a/src/diagrams/state/stateRenderer.js
+++ b/src/diagrams/state/stateRenderer.js
@@ -3,6 +3,7 @@ import dagre from 'dagre';
 import graphlib from 'graphlib';
 import { logger } from '../../logger';
 import stateDb from './stateDb';
+import common from '../common/common';
 import { parser } from './parser/stateDiagram';
 // import idCache from './id-cache';
 import { drawState, addTitleAndBox, drawEdge } from './shapes';
@@ -99,14 +100,6 @@ const getLabelWidth = text => {
  return text ? text.length * conf.fontSizeFactor : 1;
 };

-/* TODO: REMOVE DUPLICATION, SEE SHAPES */
-const getRows = s => {
-  if (!s) return 1;
-  let str = s.replace(/<br\s*\/?>/gi, '#br#');
-  str = str.replace(/\\n/g, '#br#');
-  return str.split('#br#');
-};
-
 const renderDoc = (doc, diagram, parentId, altBkg) => {
  // // Layout graph, Create a new directed graph
  const graph = new graphlib.Graph({
@@ -239,7 +232,7 @@ const renderDoc = (doc, diagram, parentId, altBkg) => {
      {
        relation: relation,
        width: getLabelWidth(relation.title),
-        height: conf.labelHeight * getRows(relation.title).length,
+        height: conf.labelHeight * common.getRows(relation.title).length,
        labelpos: 'c'
      },
      'id' + cnt
--- a/src/utils.js
+++ b/src/utils.js
@@ -74,25 +74,6 @@ export const interpolateToCurve = (interpolate, defaultCurve) => {
  return d3[curveName] || defaultCurve;
 };

-export const sanitize = (text, config) => {
-  let txt = text;
-  let htmlLabels = true;
-  if (
-    config.flowchart &&
-    (config.flowchart.htmlLabels === false || config.flowchart.htmlLabels === 'false')
-  )
-    htmlLabels = false;
-
-  if (config.securityLevel !== 'loose' && htmlLabels) { // eslint-disable-line
-    txt = txt.replace(/<br\s*\/?>/gi, '#br#');
-    txt = txt.replace(/</g, '&lt;').replace(/>/g, '&gt;');
-    txt = txt.replace(/=/g, '&equals;');
-    txt = txt.replace(/#br#/g, '<br/>');
-  }
-
-  return txt;
-};
-
 export const formatUrl = (linkStr, config) => {
  let url = linkStr.trim();

@@ -225,7 +206,6 @@ export default {
  interpolateToCurve,
  calcLabelPosition,
  calcCardinalityPosition,
-  sanitize,
  formatUrl,
  getStylesFromArray
 };