Merge branch 'master' into develop

Merge pull request #3330 from mermaid-js/3306_Fix_Gitgraph_Parsing_Issue
Fix for GitGraphs not working for Mermaid Live Editor
2025-09-19 15:30:03 +02:00 · 2022-08-18 19:57:58 +02:00 · 2022-08-18 19:43:17 +02:00 · 2022-08-18 19:39:32 +02:00 · 2022-08-18 19:16:23 +02:00 · 2022-08-18 17:54:42 +02:00
4 changed files with 19 additions and 8 deletions
--- a/docs/index.html
+++ b/docs/index.html
@@ -18,7 +18,7 @@
    <!-- <link rel="stylesheet" href="//unpkg.com/docsify/lib/themes/vue.css"> -->
    <link rel="stylesheet" href="theme.css" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.9.0/css/all.min.css">
-    <script src="//cdn.jsdelivr.net/npm/mermaid@9.1.3/dist/mermaid.min.js"></script>
+    <script src="//cdn.jsdelivr.net/npm/mermaid@9.1.5/dist/mermaid.min.js"></script>
    <!-- <script src="http://localhost:9000/mermaid.js"></script> -->
    <script>
      // prettier-ignore
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mermaid",
-  "version": "9.1.4",
+  "version": "9.1.5",
  "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
  "main": "dist/mermaid.core.js",
  "module": "dist/mermaid.esm.min.mjs",
@@ -65,7 +65,7 @@
    "dompurify": "2.3.10",
    "graphlib": "^2.1.8",
    "khroma": "^2.0.0",
-    "moment-mini": "^2.24.0",
+    "moment-mini": "2.24.0",
    "stylis": "^4.0.10"
  },
  "devDependencies": {
--- a/src/mermaidAPI.js
+++ b/src/mermaidAPI.js
@@ -40,13 +40,21 @@ import utils, { directiveSanitizer } from './utils';
 import assignWithDepth from './assignWithDepth';
 import DOMPurify from 'dompurify';
 import mermaid from './mermaid';
+
+let hasLoadedDiagrams = false;
+
 /**
 * @param text
 * @param dia
 * @returns {any}
 */
 function parse(text, dia) {
+  if (!hasLoadedDiagrams) {
+    addDiagrams();
+    hasLoadedDiagrams = true;
+  }
  var parseEncounteredException = false;
+
  try {
    const diag = dia ? dia : new Diagram(text);
    diag.db.clear();
@@ -512,7 +520,10 @@ function initialize(options) {

  updateRendererConfigs(config);
  setLogLevel(config.logLevel);
+  if (!hasLoadedDiagrams) {
    addDiagrams();
+    hasLoadedDiagrams = true;
+  }
 }

 const mermaidAPI = Object.freeze({
--- a/yarn.lock
+++ b/yarn.lock
@@ -8598,10 +8598,10 @@ module-deps-sortable@^5.0.3:
    through2 "^2.0.0"
    xtend "^4.0.0"

-moment-mini@^2.24.0:
-  version "2.29.4"
-  resolved "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.29.4.tgz#cbbcdc58ce1b267506f28ea6668dbe060a32758f"
-  integrity sha512-uhXpYwHFeiTbY9KSgPPRoo1nt8OxNVdMVoTBYHfSEKeRkIkwGpO+gERmhuhBtzfaeOyTkykSrm2+noJBgqt3Hg==
+moment-mini@2.24.0:
+  version "2.24.0"
+  resolved "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.24.0.tgz#fa68d98f7fe93ae65bf1262f6abb5fb6983d8d18"
+  integrity sha512-9ARkWHBs+6YJIvrIp0Ik5tyTTtP9PoV0Ssu2Ocq5y9v8+NOOpWiRshAp8c4rZVWTOe+157on/5G+zj5pwIQFEQ==

 moment@^2.23.0:
  version "2.29.4"
Author	SHA1	Message	Date
Knut Sveidqvist	a89b6fd054	Merge branch 'master' into develop	2022-08-18 19:57:58 +02:00
Knut Sveidqvist	02fc68a3f6	Merge pull request #3330 from mermaid-js/3306_Fix_Gitgraph_Parsing_Issue Fix for GitGraphs not working for Mermaid Live Editor	2022-08-18 19:43:17 +02:00
ashishj	a9e798c399	Making sure to addDiagrams before detectType call	2022-08-18 19:39:32 +02:00
Ashish Jain	b65c67ec2c	Merge pull request #3331 from mermaid-js/3308_allow_br_in_tooltips #3308 Allowing br tags in tooltips	2022-08-18 19:16:23 +02:00
ashishj	b21cb43639	Moved diagram registration out of initialize func	2022-08-18 17:54:42 +02:00
Knut Sveidqvist	808bcb8022	Updated version for the docs	2022-08-11 20:34:26 +02:00
Knut Sveidqvist	af8a5cbbfa	Version 9.1.5	2022-08-11 20:29:15 +02:00