#3395 Renabling the error graph which is rendered on error

#3395 Fix for lopp stopping at first failure
Merge pull request #3390 from mermaid-js/dependabot/npm_and_yarn/develop/commitlint/cli-17.1.2
2025-08-20 00:36:44 +02:00 · 2022-09-02 14:05:31 +02:00 · 2022-09-02 12:45:22 +02:00 · 2022-09-01 16:01:53 +02:00 · 2022-09-01 16:01:41 +02:00 · 2022-09-01 16:01:30 +02:00
21 changed files with 281 additions and 60 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,6 +4,7 @@ updates:
  open-pull-requests-limit: 10
  directory: /
  target-branch: develop
+  versioning-strategy: increase
  schedule:
    interval: weekly
    day: monday
--- a/cypress/platform/knsv.html
+++ b/cypress/platform/knsv.html
@@ -35,8 +35,14 @@
  <body>


-
-
+<div class="mermaid2" style="width: 50%;">
+flowchart LR
+  a ---
+</div>
+<div class="mermaid" style="width: 50%;">
+flowchart LR
+  a2 ---
+</div>
 <div class="mermaid2" style="width: 50%;">
 flowchart LR
  classDef aPID stroke:#4e4403,fill:#fdde29,color:#4e4403,rx:5px,ry:5px;
@@ -73,7 +79,31 @@ flowchart TD
 </div>
 <div class="mermaid" style="width: 50%;">
 flowchart TD
-id
+
+  release-branch[Create Release Branch]:::relClass
+  develop-branch[Update Develop Branch]:::relClass
+  github-release-draft[GitHub Release Draft]:::relClass
+  trigger-pipeline[Trigger Jenkins pipeline]:::fixClass
+  github-release[GitHub Release]:::postClass
+
+  build-ready --> release-branch
+  build-ready --> develop-branch
+  release-branch --> jenkins-release-build
+  jenkins-release-build --> github-release-draft
+  jenkins-release-build --> install-release
+  install-release --> verify-release
+  jenkins-release-build --> announce
+  github-release-draft --> github-release
+  verify-release --> verify-check
+  verify-check -- Yes --> github-release
+  verify-check -- No --> release-fix
+  release-fix --> release-branch-pr
+  verify-check -- No --> delete-artifacts
+  release-branch-pr --> trigger-pipeline
+  delete-artifacts --> trigger-pipeline
+  trigger-pipeline --> jenkins-release-build
+
+
 </div>
 <div class="mermaid2" style="width: 50%;">
 flowchart LR
@@ -356,6 +386,11 @@ function clickByFlow(elemName) {

  document.getElementsByTagName('body')[0].appendChild(div);
 }
+
+mermaid.parseError = function (err, hash) {
+  console.error('In parse error:');
+  console.error(err);
+};
    </script>
  </body>
 </html>
--- a/demos/index.html
+++ b/demos/index.html
@@ -879,6 +879,31 @@ Enterprise_Boundary(b0, "BankBoundary0") {
        }
  </div>

+  <div class="mermaid">
+    classDiagram
+    Interface1 ()-- Interface1Impl
+  </div>
+
+  <div class="mermaid">
+    classDiagram 
+    direction LR
+    Animal ()-- Dog
+    Dog : bark()
+    Dog : species()
+  </div>
+
+  <div class="mermaid">
+    classDiagram 
+    direction RL
+    Fruit ()-- Apple
+    Apple : color()
+    Apple : -int leafCount()
+    Fruit ()-- Pineapple
+    Pineapple : color()
+    Pineapple : -int leafCount()
+    Pineapple : -int spikeCount()
+  </div>
+
  <div class="mermaid">
    stateDiagram
    accDescription This is a state diagram showing one state
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
    "@babel/eslint-parser": "^7.14.7",
    "@babel/preset-env": "^7.14.7",
    "@babel/register": "^7.14.5",
-    "@commitlint/cli": "^17.0.0",
+    "@commitlint/cli": "^17.1.2",
    "@commitlint/config-conventional": "^17.0.0",
    "babel-jest": "^29.0.1",
    "babel-loader": "^8.2.2",
@@ -105,10 +105,10 @@
    "prettier": "^2.3.2",
    "prettier-plugin-jsdoc": "^0.3.30",
    "start-server-and-test": "^1.12.6",
-    "terser-webpack-plugin": "^5.2.4",
+    "terser-webpack-plugin": "^5.3.6",
    "webpack": "^5.53.0",
    "webpack-cli": "^4.7.2",
-    "webpack-dev-server": "^4.3.0",
+    "webpack-dev-server": "^4.10.1",
    "webpack-merge": "^5.8.0",
    "webpack-node-externals": "^3.0.0"
  },
--- a/src/dagre-wrapper/edges.js
+++ b/src/dagre-wrapper/edges.js
@@ -510,6 +510,9 @@ export const insertEdge = function (elem, e, edge, clusterDb, diagramType, graph
    case 'dependency':
      svgPath.attr('marker-start', 'url(' + url + '#' + diagramType + '-dependencyStart' + ')');
      break;
+    case 'lollipop':
+      svgPath.attr('marker-start', 'url(' + url + '#' + diagramType + '-lollipopStart' + ')');
+      break;
    default:
  }
  switch (edge.arrowTypeEnd) {
@@ -537,6 +540,9 @@ export const insertEdge = function (elem, e, edge, clusterDb, diagramType, graph
    case 'dependency':
      svgPath.attr('marker-end', 'url(' + url + '#' + diagramType + '-dependencyEnd' + ')');
      break;
+    case 'lollipop':
+      svgPath.attr('marker-end', 'url(' + url + '#' + diagramType + '-lollipopEnd' + ')');
+      break;
    default:
  }
  let paths = {};
--- a/src/dagre-wrapper/markers.js
+++ b/src/dagre-wrapper/markers.js
@@ -119,6 +119,24 @@ const dependency = (elem, type) => {
    .append('path')
    .attr('d', 'M 18,7 L9,13 L14,7 L9,1 Z');
 };
+const lollipop = (elem, type, id) => {
+  elem
+    .append('defs')
+    .append('marker')
+    .attr('id', type + '-lollipopStart')
+    .attr('class', 'marker lollipop ' + type)
+    .attr('refX', 0)
+    .attr('refY', 7)
+    .attr('markerWidth', 190)
+    .attr('markerHeight', 240)
+    .attr('orient', 'auto')
+    .append('circle')
+    .attr('stroke', 'black')
+    .attr('fill', 'white')
+    .attr('cx', 6)
+    .attr('cy', 7)
+    .attr('r', 6);
+};
 const point = (elem, type) => {
  elem
    .append('marker')
@@ -250,6 +268,7 @@ const markers = {
  composition,
  aggregation,
  dependency,
+  lollipop,
  point,
  circle,
  cross,
--- a/src/diagram-api/detectType.js
+++ b/src/diagram-api/detectType.js
@@ -31,6 +31,9 @@ const detectType = function (text, cnf) {
    return 'c4';
  }

+  if (text === 'error') {
+    return 'error';
+  }
  if (text.match(/^\s*sequenceDiagram/)) {
    return 'sequence';
  }
--- a/src/diagram-api/diagramAPI.js
+++ b/src/diagram-api/diagramAPI.js
@@ -7,6 +7,7 @@ import classRendererV2 from '../diagrams/class/classRenderer-v2';
 import classParser from '../diagrams/class/parser/classDiagram';
 import erDb from '../diagrams/er/erDb';
 import erRenderer from '../diagrams/er/erRenderer';
+import errorRenderer from '../diagrams/error/errorRenderer';
 import erParser from '../diagrams/er/parser/erDiagram';
 import flowDb from '../diagrams/flowchart/flowDb';
 import flowRenderer from '../diagrams/flowchart/flowRenderer';
@@ -54,6 +55,13 @@ const diagrams = {
      classDb.clear();
    },
  },
+  // Special diagram with error messages but setup as a regular diagram
+  error: {
+    db: {},
+    renderer: errorRenderer,
+    parser: { parser: { yy: {} }, parse: () => {} },
+    init: () => {},
+  },
  classDiagram: {
    db: classDb,
    renderer: classRendererV2,
--- a/src/diagrams/class/classDb.js
+++ b/src/diagrams/class/classDb.js
@@ -313,6 +313,7 @@ export const relationType = {
  EXTENSION: 1,
  COMPOSITION: 2,
  DEPENDENCY: 3,
+  LOLLIPOP: 4,
 };

 const setupToolTips = function (element) {
--- a/src/diagrams/class/classRenderer-v2.js
+++ b/src/diagrams/class/classRenderer-v2.js
@@ -341,7 +341,13 @@ export const draw = function (text, id, _version, diagObj) {

  // Run the renderer. This is what draws the final graph.
  const element = root.select('#' + id + ' g');
-  render(element, g, ['aggregation', 'extension', 'composition', 'dependency'], 'classDiagram', id);
+  render(
+    element,
+    g,
+    ['aggregation', 'extension', 'composition', 'dependency', 'lollipop'],
+    'classDiagram',
+    id
+  );

  setupGraphViewbox(g, svg, conf.diagramPadding, conf.useMaxWidth);

@@ -423,6 +429,9 @@ function getArrowMarker(type) {
    case 3:
      marker = 'dependency';
      break;
+    case 4:
+      marker = 'lollipop';
+      break;
    default:
      marker = 'none';
  }
--- a/src/diagrams/class/parser/classDiagram.jison
+++ b/src/diagrams/class/parser/classDiagram.jison
@@ -44,6 +44,7 @@ accDescr\s*"{"\s*                                { this.begin("acc_descr_multili
 "classDiagram-v2"       return 'CLASS_DIAGRAM';
 "classDiagram"          return 'CLASS_DIAGRAM';
 [{]                     { this.begin("struct"); /*console.log('Starting struct');*/ return 'STRUCT_START';}
+<INITIAL,struct>"[*]"   { /*console.log('EDGE_STATE=',yytext);*/ return 'EDGE_STATE';}
 <struct><<EOF>>         return "EOF_IN_STRUCT";
 <struct>[{]             return "OPEN_IN_STRUCT";
 <struct>[}]             { /*console.log('Ending struct');*/this.popState(); return 'STRUCT_STOP';}}
@@ -104,6 +105,7 @@ Function arguments are optional: 'call <callback_name>()' simply executes 'callb
 \s*\<                 return 'DEPENDENCY';
 \s*\*                 return 'COMPOSITION';
 \s*o                  return 'AGGREGATION';
+\s*\(\)               return 'LOLLIPOP';
 \-\-                  return 'LINE';
 \.\.                  return 'DOTTED_LINE';
 ":"{1}[^:\n;]+        return 'LABEL';
@@ -310,6 +312,7 @@ relationType
    | EXTENSION   { $$=yy.relationType.EXTENSION;}
    | COMPOSITION { $$=yy.relationType.COMPOSITION;}
    | DEPENDENCY  { $$=yy.relationType.DEPENDENCY;}
+    | LOLLIPOP    { $$=yy.relationType.LOLLIPOP;}
    ;

 lineType
--- a/src/diagrams/class/styles.js
+++ b/src/diagrams/class/styles.js
@@ -128,6 +128,18 @@ g.classGroup line {
  stroke-width: 1;
 }

+#lollipopStart, .lollipop {
+  fill: ${options.mainBkg} !important;
+  stroke: ${options.lineColor} !important;
+  stroke-width: 1;
+}
+
+#lollipopEnd, .lollipop {
+  fill: ${options.mainBkg} !important;
+  stroke: ${options.lineColor} !important;
+  stroke-width: 1;
+}
+
 .edgeTerminals {
  font-size: 11px;
 }
--- a/src/diagrams/class/svgDraw.js
+++ b/src/diagrams/class/svgDraw.js
@@ -15,6 +15,8 @@ export const drawEdge = function (elem, path, relation, conf, diagObj) {
        return 'composition';
      case diagObj.db.DEPENDENCY:
        return 'dependency';
+      case diagObj.db.LOLLIPOP:
+        return 'lollipop';
    }
  };

--- a/src/diagrams/common/common.js
+++ b/src/diagrams/common/common.js
@@ -57,11 +57,11 @@ export const removeScript = (txt) => {
    }
  }
  let decodedText = removeEscapes(rs);
-  decodedText = decodedText.replaceAll(/script>/gi, '#');
-  decodedText = decodedText.replaceAll(/javascript:/gi, '#');
-  decodedText = decodedText.replaceAll(/javascript&colon/gi, '#');
-  decodedText = decodedText.replaceAll(/onerror=/gi, 'onerror:');
-  decodedText = decodedText.replaceAll(/<iframe/gi, '');
+  decodedText = decodedText.replace(/script>/gi, '#');
+  decodedText = decodedText.replace(/javascript:/gi, '#');
+  decodedText = decodedText.replace(/javascript&colon/gi, '#');
+  decodedText = decodedText.replace(/onerror=/gi, 'onerror:');
+  decodedText = decodedText.replace(/<iframe/gi, '');
  return decodedText;
 };

--- a/src/diagrams/error/errorRenderer.js
+++ b/src/diagrams/error/errorRenderer.js
@@ -1,6 +1,6 @@
 /** Created by knut on 14-12-11. */
 import { select } from 'd3';
-import { log } from './logger';
+import { log } from '../../logger';

 const conf = {};

@@ -20,10 +20,11 @@ export const setConf = function (cnf) {
 /**
 * Draws a an info picture in the tag with id: id based on the graph definition in text.
 *
+ * @param _txt
 * @param {string} id The text for the error
 * @param {string} ver The version
 */
-export const draw = (id, ver) => {
+export const draw = (_txt, id, ver) => {
  try {
    log.debug('Renering svg for syntax error\n');

@@ -75,22 +76,22 @@ export const draw = (id, ver) => {

    g.append('text') // text label for the x axis
      .attr('class', 'error-text')
-      .attr('x', 1240)
+      .attr('x', 1440)
      .attr('y', 250)
      .attr('font-size', '150px')
      .style('text-anchor', 'middle')
      .text('Syntax error in graph');
    g.append('text') // text label for the x axis
      .attr('class', 'error-text')
-      .attr('x', 1050)
+      .attr('x', 1250)
      .attr('y', 400)
      .attr('font-size', '100px')
      .style('text-anchor', 'middle')
      .text('mermaid version ' + ver);

    svg.attr('height', 100);
-    svg.attr('width', 400);
-    svg.attr('viewBox', '768 0 512 512');
+    svg.attr('width', 500);
+    svg.attr('viewBox', '768 0 912 512');
  } catch (e) {
    log.error('Error while rendering info diagram');
    log.error(e.message);
--- a/src/diagrams/error/styles.js
+++ b/src/diagrams/error/styles.js
@@ -0,0 +1,3 @@
+const getStyles = () => ``;
+
+export default getStyles;
--- a/src/diagrams/git/gitGraphRenderer.js
+++ b/src/diagrams/git/gitGraphRenderer.js
@@ -343,7 +343,7 @@ const findLane = (y1, y2, _depth) => {
    return candidate;
  }
  const diff = Math.abs(y1 - y2);
-  return findLane(y1, y2 - diff / 5, depth);
+  return findLane(y1, y2 - diff / 5, depth + 1);
 };

 /**
--- a/src/mermaid.js
+++ b/src/mermaid.js
@@ -35,9 +35,6 @@ const init = function () {
  } catch (e) {
    log.warn('Syntax Error rendering');
    log.warn(e.str);
-    if (this.parseError) {
-      this.parseError(e);
-    }
  }
 };

@@ -93,8 +90,10 @@ const initThrowsErrors = function () {
  const idGenerator = new utils.initIdGenerator(conf.deterministicIds, conf.deterministicIDSeed);

  let txt;
+  const errors = [];

  for (let i = 0; i < nodes.length; i++) {
+    log.info('Rendering diagram: ' + nodes[i].id, i);
    // element is the current div with mermaid class
    const element = nodes[i];

@@ -134,10 +133,16 @@ const initThrowsErrors = function () {
        element
      );
    } catch (error) {
-      log.warn('Catching Error (bootstrap)');
-      throw { error, message: error.str };
+      log.warn('Catching Error (bootstrap)', error);
+      if (typeof mermaid.parseError === 'function') {
+        mermaid.parseError({ error, str: error.str, hash: error.hash, message: error.str });
+      }
+      errors.push({ error, str: error.str, hash: error.hash, message: error.str });
    }
  }
+  if (errors.length > 0) {
+    throw errors[0];
+  }
 };

 const initialize = function (config) {
--- a/src/mermaidAPI.js
+++ b/src/mermaidAPI.js
@@ -31,7 +31,7 @@ import stateRenderer from './diagrams/state/stateRenderer';
 import stateRendererV2 from './diagrams/state/stateRenderer-v2';
 import journeyRenderer from './diagrams/user-journey/journeyRenderer';
 import Diagram from './Diagram';
-import errorRenderer from './errorRenderer';
+import errorRenderer from './diagrams/error/errorRenderer';
 import { attachFunctions } from './interactionDb';
 import { log, setLogLevel } from './logger';
 import getStyles from './styles';
@@ -259,7 +259,14 @@ const render = function (id, _txt, cb, container) {
  txt = encodeEntities(txt);

  // Important that we do not create the diagram until after the directives have been included
-  const diag = new Diagram(txt);
+  let diag;
+  let parseEncounteredException;
+  try {
+    diag = new Diagram(txt);
+  } catch (error) {
+    diag = new Diagram('error');
+    parseEncounteredException = error;
+  }
  // Get the tmp element containing the the svg
  const element = root.select('#d' + id).node();
  const graphType = diag.type;
@@ -404,6 +411,10 @@ const render = function (id, _txt, cb, container) {
    select(tmpElementSelector).node().remove();
  }

+  if (parseEncounteredException) {
+    throw parseEncounteredException;
+  }
+
  return svgCode;
 };

--- a/src/styles.js
+++ b/src/styles.js
@@ -1,5 +1,6 @@
 import classDiagram from './diagrams/class/styles';
 import er from './diagrams/er/styles';
+import error from './diagrams/error/styles';
 import flowchart from './diagrams/flowchart/styles';
 import gantt from './diagrams/gantt/styles';
 import gitGraph from './diagrams/git/styles';
@@ -26,6 +27,7 @@ const themes = {
  info,
  pie,
  er,
+  error,
  journey,
  requirement,
  c4,
--- a/yarn.lock
+++ b/yarn.lock
@@ -1532,14 +1532,14 @@
  resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.0.tgz#fe364f025ba74f6de6c837a84ef44bdb1d61e68f"
  integrity sha512-mgmE7XBYY/21erpzhexk4Cj1cyTQ9LzvnTxtzM17BJ7ERMNE6W72mQRo0I1Ud8eFJ+RVVIcBNhLFZ3GX4XFz5w==

-"@commitlint/cli@^17.0.0":
-  version "17.1.1"
-  resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.1.1.tgz#994e91a873aea2bcb53dfa3225ffce2c9022fd3e"
-  integrity sha512-xyQJNJs1j18At5wSBF6bMo1on6ZrpcHUr4duacznPU0RnywCAABDBP1s63BmhkTMdNXLVgVM4J1H2sG0HSS3IA==
+"@commitlint/cli@^17.1.2":
+  version "17.1.2"
+  resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.1.2.tgz#38240f84936df5216f749f06f838dc50cc85a43d"
+  integrity sha512-h/4Hlka3bvCLbnxf0Er2ri5A44VMlbMSkdTRp8Adv2tRiklSTRIoPGs7OEXDv3EoDs2AAzILiPookgM4Gi7LOw==
  dependencies:
    "@commitlint/format" "^17.0.0"
    "@commitlint/lint" "^17.1.0"
-    "@commitlint/load" "^17.1.1"
+    "@commitlint/load" "^17.1.2"
    "@commitlint/read" "^17.1.0"
    "@commitlint/types" "^17.0.0"
    execa "^5.0.0"
@@ -1602,10 +1602,10 @@
    "@commitlint/rules" "^17.0.0"
    "@commitlint/types" "^17.0.0"

-"@commitlint/load@^17.1.1":
-  version "17.1.1"
-  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-17.1.1.tgz#16f945d2cc4a5d4d75cccc3d7df8066ff152024b"
-  integrity sha512-jEgdDabfj58kFKZmB7rMtmQa7Feo7Ozh3KmvIlXWqrJmal5auO1RC0Iczfl52DlPn26Uo0goUDHrhoAFs2ze0Q==
+"@commitlint/load@^17.1.2":
+  version "17.1.2"
+  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-17.1.2.tgz#19c88be570d8666bbd32f9b3d81925a08328bc13"
+  integrity sha512-sk2p/jFYAWLChIfOIp/MGSIn/WzZ0vkc3afw+l4X8hGEYkvDe4gQUUAVxjl/6xMRn0HgnSLMZ04xXh5pkTsmgg==
  dependencies:
    "@commitlint/config-validator" "^17.1.0"
    "@commitlint/execute-rule" "^17.0.0"
@@ -1614,9 +1614,10 @@
    "@types/node" "^14.0.0"
    chalk "^4.1.0"
    cosmiconfig "^7.0.0"
-    cosmiconfig-typescript-loader "^3.0.0"
+    cosmiconfig-typescript-loader "^4.0.0"
    lodash "^4.17.19"
    resolve-from "^5.0.0"
+    ts-node "^10.8.1"
    typescript "^4.6.4"

 "@commitlint/message@^17.0.0":
@@ -1686,6 +1687,13 @@
  dependencies:
    chalk "^4.1.0"

+"@cspotcode/source-map-support@^0.8.0":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
+  dependencies:
+    "@jridgewell/trace-mapping" "0.3.9"
+
 "@cypress/request@^2.88.10":
  version "2.88.10"
  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce"
@@ -2091,6 +2099,14 @@
  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==

+"@jridgewell/trace-mapping@0.3.9":
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@jridgewell/trace-mapping@^0.3.0", "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.9":
  version "0.3.15"
  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774"
@@ -2183,6 +2199,26 @@
  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==

+"@tsconfig/node10@^1.0.7":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
+  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
+
+"@tsconfig/node12@^1.0.7":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
+
+"@tsconfig/node14@^1.0.0":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
+  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
+
+"@tsconfig/node16@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
+  integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
+
 "@types/babel__core@^7.1.14":
  version "7.1.17"
  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.17.tgz#f50ac9d20d64153b510578d84f9643f9a3afbe64"
@@ -2825,7 +2861,7 @@ acorn-walk@^7.0.0, acorn-walk@^7.1.1:
  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==

-acorn-walk@^8.2.0:
+acorn-walk@^8.1.1, acorn-walk@^8.2.0:
  version "8.2.0"
  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -2835,16 +2871,16 @@ acorn@^7.0.0, acorn@^7.1.1:
  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==

+acorn@^8.4.1, acorn@^8.8.0:
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
+  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
+
 acorn@^8.5.0, acorn@^8.7.0, acorn@^8.7.1:
  version "8.7.1"
  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==

-acorn@^8.8.0:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
-  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
-
 add-stream@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
@@ -3016,6 +3052,11 @@ arch@^2.2.0:
  resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
  integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==

+arg@^4.1.0:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
 argparse@^1.0.7:
  version "1.0.10"
  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -4237,10 +4278,10 @@ core-util-is@~1.0.0:
  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==

-cosmiconfig-typescript-loader@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.1.2.tgz#e147457854cabe1416152bdca55f53449b1f865d"
-  integrity sha512-rIwakk27LtK7vjSjGgs3FDbKkq41Byw3VHRGRuAkRQLfGla+O7s+cy1FXRkjLSZ2G9z1og1bcOIsELo1w4G0Kg==
+cosmiconfig-typescript-loader@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.0.0.tgz#4a6d856c1281135197346a6f64dfa73a9cd9fefa"
+  integrity sha512-cVpucSc2Tf+VPwCCR7SZzmQTQkPbkk4O01yXsYqXBIbjE1bhwqSyAgYQkRK1un4i0OPziTleqFhdkmOc4RQ/9g==

 cosmiconfig@^7.0.0:
  version "7.0.1"
@@ -4264,6 +4305,11 @@ coveralls@^3.0.2:
    minimist "^1.2.5"
    request "^2.88.2"

+create-require@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
 cross-spawn@^6.0.0:
  version "6.0.5"
  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -8175,6 +8221,11 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
  dependencies:
    semver "^6.0.0"

+make-error@^1.1.1:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
 makeerror@1.0.12:
  version "1.0.12"
  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
@@ -11015,10 +11066,10 @@ terminal-link@^2.0.0:
    ansi-escapes "^4.2.1"
    supports-hyperlinks "^2.0.0"

-terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.4:
-  version "5.3.5"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.5.tgz#f7d82286031f915a4f8fb81af4bd35d2e3c011bc"
-  integrity sha512-AOEDLDxD2zylUGf/wxHxklEkOe2/r+seuyOWujejFrIxHf11brA1/dWQNIgXa1c6/Wkxgu7zvv0JhOWfc2ELEA==
+terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.3.6:
+  version "5.3.6"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c"
+  integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==
  dependencies:
    "@jridgewell/trace-mapping" "^0.3.14"
    jest-worker "^27.4.5"
@@ -11238,6 +11289,25 @@ trough@^1.0.0:
  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
  integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==

+ts-node@^10.8.1:
+  version "10.9.1"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
+  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
+  dependencies:
+    "@cspotcode/source-map-support" "^0.8.0"
+    "@tsconfig/node10" "^1.0.7"
+    "@tsconfig/node12" "^1.0.7"
+    "@tsconfig/node14" "^1.0.0"
+    "@tsconfig/node16" "^1.0.2"
+    acorn "^8.4.1"
+    acorn-walk "^8.1.1"
+    arg "^4.1.0"
+    create-require "^1.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    v8-compile-cache-lib "^3.0.1"
+    yn "3.1.1"
+
 tslib@^1.8.1:
  version "1.14.1"
  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -11565,6 +11635,11 @@ uvu@^0.5.0:
    kleur "^4.0.3"
    sade "^1.7.3"

+v8-compile-cache-lib@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
+
 v8-to-istanbul@^9.0.1:
  version "9.0.1"
  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4"
@@ -11859,10 +11934,10 @@ webpack-dev-middleware@^5.3.1:
    range-parser "^1.2.1"
    schema-utils "^4.0.0"

-webpack-dev-server@^4.3.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.10.0.tgz#de270d0009eba050546912be90116e7fd740a9ca"
-  integrity sha512-7dezwAs+k6yXVFZ+MaL8VnE+APobiO3zvpp3rBHe/HmWQ+avwh0Q3d0xxacOiBybZZ3syTZw9HXzpa3YNbAZDQ==
+webpack-dev-server@^4.10.1:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.10.1.tgz#124ac9ac261e75303d74d95ab6712b4aec3e12ed"
+  integrity sha512-FIzMq3jbBarz3ld9l7rbM7m6Rj1lOsgq/DyLGMX/fPEB1UBUPtf5iL/4eNfhx8YYJTRlzfv107UfWSWcBK5Odw==
  dependencies:
    "@types/bonjour" "^3.5.9"
    "@types/connect-history-api-fallback" "^1.3.5"
@@ -12072,12 +12147,7 @@ ws@8.5.0:
  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==

-ws@^8.2.3, ws@^8.4.2:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz#e5e9f1d9e7ff88083d0c0dd8281ea662a42c9c23"
-  integrity sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==
-
-ws@^8.8.0:
+ws@^8.2.3, ws@^8.4.2, ws@^8.8.0:
  version "8.8.1"
  resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0"
  integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==
@@ -12211,6 +12281,11 @@ yauzl@^2.10.0:
    buffer-crc32 "~0.2.3"
    fd-slicer "~1.1.0"

+yn@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
 yocto-queue@^0.1.0:
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
Author	SHA1	Message	Date
Knut Sveidqvist	5584fef1b0	#3395 Renabling the error graph which is rendered on error	2022-09-02 14:05:31 +02:00
Knut Sveidqvist	98f37d64ea	#3395 Fix for lopp stopping at first failure	2022-09-02 12:45:22 +02:00
Knut Sveidqvist	f4a99fc612	Merge pull request #3390 from mermaid-js/dependabot/npm_and_yarn/develop/commitlint/cli-17.1.2 chore(deps-dev): bump @commitlint/cli from 17.1.1 to 17.1.2	2022-09-01 16:01:53 +02:00
Knut Sveidqvist	b00d569215	Merge pull request #3389 from mermaid-js/dependabot/npm_and_yarn/develop/terser-webpack-plugin-5.3.6 chore(deps-dev): bump terser-webpack-plugin from 5.3.5 to 5.3.6	2022-09-01 16:01:41 +02:00
Knut Sveidqvist	1921623bdf	Merge pull request #3387 from mermaid-js/dependabot/npm_and_yarn/develop/webpack-dev-server-4.10.1 chore(deps-dev): bump webpack-dev-server from 4.10.0 to 4.10.1	2022-09-01 16:01:30 +02:00
Knut Sveidqvist	3502fb46f8	Merge pull request #3383 from hughli-git/fix_git_stack_exceeded Fix gitGraph findLane function error	2022-09-01 16:00:43 +02:00
Knut Sveidqvist	bacdd49176	Merge pull request #3380 from mermaid-js/3056_Chrome_Compatibility 3056 chrome compatibility	2022-09-01 15:59:46 +02:00
Knut Sveidqvist	065a3176b8	Merge pull request #3379 from mermaid-js/3238_Gitgraph_merge_commits 3238 gitgraph merge commits	2022-09-01 15:57:43 +02:00
dependabot[bot]	0092ca1da0	chore(deps-dev): bump @commitlint/cli from 17.1.1 to 17.1.2 Bumps [@commitlint/cli](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/cli) from 17.1.1 to 17.1.2. - [Release notes](https://github.com/conventional-changelog/commitlint/releases) - [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/cli/CHANGELOG.md) - [Commits](https://github.com/conventional-changelog/commitlint/commits/v17.1.2/@commitlint/cli) --- updated-dependencies: - dependency-name: "@commitlint/cli" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-09-01 08:22:51 +00:00
dependabot[bot]	fa85e2a650	chore(deps-dev): bump terser-webpack-plugin from 5.3.5 to 5.3.6 Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 5.3.5 to 5.3.6. - [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v5.3.5...v5.3.6) --- updated-dependencies: - dependency-name: terser-webpack-plugin dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-09-01 08:22:31 +00:00
dependabot[bot]	3dc7e0e694	chore(deps-dev): bump webpack-dev-server from 4.10.0 to 4.10.1 Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.10.0 to 4.10.1. - [Release notes](https://github.com/webpack/webpack-dev-server/releases) - [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-dev-server/compare/v4.10.0...v4.10.1) --- updated-dependencies: - dependency-name: webpack-dev-server dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-09-01 08:21:49 +00:00
Knut Sveidqvist	98b2febe30	Merge pull request #3382 from mermaid-js/fix-dependabot Update dependabot.yml	2022-09-01 10:19:45 +02:00
hughligit	9d5e855e8e	Fix gitGraph findLane function error findLane may infinite loop after recursive call, then cause RangeError: Maximum call stack size exceeded.	2022-08-31 16:51:36 +08:00
Sidharth Vinod	e7b199adaf	Update dependabot.yml	2022-08-31 11:48:23 +05:30
ashishj	8f107026a9	Merge branch 'develop' into 3056_Chrome_Compatibility	2022-08-30 19:57:38 +02:00
ashishj	c846b48882	Replacing replaceAll with replace	2022-08-30 19:55:01 +02:00
Ashish Jain	5b63260240	Merge pull request #3311 from may4everL/1145_lollipop_interface Added lollipop feature for updated codebase	2022-08-30 18:16:49 +02:00
may4everL	7257bba3f3	Added lollipop feature for updated codebase	2022-08-09 22:44:11 -07:00