Merge branch 'master' into develop

mermaid-js · Oct 20, 2023 · d32c18a · d32c18a
2 parents 33a5fc4 + 35b364c
commit d32c18a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/cypress/platform/knsv2.html b/cypress/platform/knsv2.html
@@ -58,8 +58,10 @@
  </head>
  <body>
  <pre id="diagram" class="mermaid">
- classDiagram
- `Class<img src=x onerror=alert(1)>` <|-- `Class2<img src=x onerror=alert(2)>`
+flowchart-elk LR
+ subgraph example
+ node
+ end
  </pre>
  <pre id="diagram" class="mermaid2">
 flowchart

diff --git a/packages/mermaid/package.json b/packages/mermaid/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mermaid",
- "version": "10.5.0",
+ "version": "10.5.1",
  "description": "Markdown-ish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
  "type": "module",
  "module": "./dist/mermaid.core.mjs",

diff --git a/packages/mermaid/src/diagrams/flowchart/elk/flowRenderer-elk.js b/packages/mermaid/src/diagrams/flowchart/elk/flowRenderer-elk.js
@@ -803,8 +803,14 @@ const insertChildren = (nodeArray, parentLookupDb) => {
  */
 
 export const draw = async function (text, id, _version, diagObj) {
+ // Add temporary render element
+ diagObj.db.clear();
  nodeDb = {};
  portPos = {};
+ diagObj.db.setGen('gen-2');
+ // Parse the graph definition
+ diagObj.parser.parse(text);
+
  const renderEl = select('body').append('div').attr('style', 'height:400px').attr('id', 'cy');
  let graph = {
  id: 'root',

diff --git a/packages/mermaid/src/docs/.vitepress/theme/index.ts b/packages/mermaid/src/docs/.vitepress/theme/index.ts
@@ -6,8 +6,8 @@ import Mermaid from './Mermaid.vue';
 import Contributors from '../components/Contributors.vue';
 // @ts-ignore
 import HomePage from '../components/HomePage.vue';
-// @ts-ignore
-import TopBar from '../components/TopBar.vue';
+// // @ts-ignore
+// import TopBar from '../components/TopBar.vue';
 
 import { getRedirect } from './redirect.js';
 
@@ -21,7 +21,8 @@ export default {
  ...DefaultTheme,
  Layout() {
  return h(Theme.Layout, null, {
- 'home-hero-before': () => h(TopBar),
+ // Keeping this as comment as it took a lot of time to figure out how to add a component to the top bar.
+ // 'home-hero-before': () => h(TopBar),
  'home-features-after': () => h(HomePage),
  });
  },

diff --git a/packages/mermaid/src/docs/index.md b/packages/mermaid/src/docs/index.md
@@ -31,7 +31,7 @@ features:
  - title: 🏆 Award winning!
  details: 2019 JavaScript Open Source Award winner for "The Most Exciting Use of Technology".
  link: https://osawards.com/javascript/2019
- - title: 🎉 We are on Product Hunt!
- details: We would love any and all support from the Mermaid community!
- link: https://www.producthunt.com/posts/mermaid-chart
+ - title: 🥰 Mermaid + Mermaid Chart
+ details: Mermaid Chart is a major supporter of the Mermaid project.
+ link: https://www.mermaidchart.com/
 ---