Merge branch 'sidv/splitELK' into sidv/priorityToDiagrams

* sidv/splitELK:
  5043 Move ELK to standalone package

.build/jsonSchema.ts

@@ -1,6 +1,7 @@
 import { load, JSON_SCHEMA } from 'js-yaml';
 import assert from 'node:assert';
 import Ajv2019, { type JSONSchemaType } from 'ajv/dist/2019.js';
+
 import type { MermaidConfig, BaseDiagramConfig } from '../packages/mermaid/src/config.type.js';
 
 /**
@@ -23,8 +24,6 @@ const MERMAID_CONFIG_DIAGRAM_KEYS = [
   'gitGraph',
   'c4',
   'sankey',
-  'block',
-  'packet',
 ] as const;
 
 /**

.build/langium-cli.d.ts

@@ -0,0 +1,9 @@
+declare module 'langium-cli' {
+  export interface GenerateOptions {
+    file?: string;
+    mode?: 'development' | 'production';
+    watch?: boolean;
+  }
+
+  export function generate(options: GenerateOptions): Promise<boolean>;
+}

.build/types.ts

@@ -1,18 +0,0 @@
-import { packageOptions } from './common.js';
-import { execSync } from 'child_process';
-
-const buildType = (packageName: string) => {
-  console.log(`Building types for ${packageName}`);
-  try {
-    const out = execSync(`tsc -p ./packages/${packageName}/tsconfig.json --emitDeclarationOnly`);
-    out.length > 0 && console.log(out.toString());
-  } catch (e) {
-    console.error(e);
-    e.stdout.length > 0 && console.error(e.stdout.toString());
-    e.stderr.length > 0 && console.error(e.stderr.toString());
-  }
-};
-
-for (const { packageName } of Object.values(packageOptions)) {
-  buildType(packageName);
-}

.cspell/code-terms.txt

@@ -1,140 +0,0 @@
-# This file contains coding related terms
-ALPHANUM
-antiscript
-APPLYCLASS
-ARROWHEADSTYLE
-ARROWTYPE
-autonumber
-axisl-line
-Bigdecimal
-birel
-BIREL
-bqstring
-BQUOTE
-bramp
-BRKT
-callbackargs
-callbackname
-classdef
-classdefid
-classentity
-classname
-COLONSEP
-COMPOSIT_STATE
-concat
-controlx
-controly
-CSSCLASS
-CYLINDEREND
-CYLINDERSTART
-datakey
-DEND
-descr
-distp
-distq
-divs
-docref
-DOMID
-doublecircle
-DOUBLECIRCLEEND
-DOUBLECIRCLESTART
-DQUOTE
-DSTART
-edgesep
-EMPTYSTR
-enddate
-ERDIAGRAM
-flatmap
-forwardable
-frontmatter
-funs
-gantt
-GENERICTYPE
-getBoundarys
-grammr
-graphtype
-iife
-interp
-introdcued
-INVTRAPEND
-INVTRAPSTART
-JDBC
-jison
-Kaufmann
-keyify
-LABELPOS
-LABELTYPE
-lcov
-LEFTOF
-Lexa
-linebreak
-LINETYPE
-LINKSTYLE
-LLABEL
-loglevel
-LOGMSG
-lookaheads
-mdast
-metafile
-minlen
-Mstartx
-MULT
-NODIR
-NSTR
-outdir
-Qcontrolx
-reinit
-rels
-reqs
-rewritelinks
-rgba
-RIGHTOF
-sankey
-sequencenumber
-shrc
-signaltype
-someclass
-SPACELINE
-SPACELIST
-STADIUMEND
-STADIUMSTART
-startdate
-startx
-starty
-STMNT
-stopx
-stopy
-strikethrough
-stringifying
-struct
-STYLECLASS
-STYLEOPTS
-subcomponent
-subcomponents
-SUBROUTINEEND
-SUBROUTINESTART
-Subschemas
-substr
-TAGEND
-TAGSTART
-techn
-TESTSTR
-TEXTDATA
-TEXTLENGTH
-titlevalue
-topbar
-TRAPEND
-TRAPSTART
-ts-nocheck
-tsdoc
-typeof
-typestr
-unshift
-verifymethod
-VERIFYMTHD
-WARN_DOCSDIR_DOESNT_MATCH
-xhost
-yaxis
-yfunc
-yytext
-zenuml

.cspell/contributors.txt

@@ -1,8 +0,0 @@
-# Contributors to mermaidjs, one per line
-Ashish Jain
-cpettitt
-Dong Cai
-Nikolay Rozhkov
-Peng Xiao
-subhash-halder
-Vinod Sidharth

.cspell/cspell.config.yaml

@@ -1,52 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json
-
-$schema: https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json
-
-dictionaryDefinitions:
-  - name: code-terms
-    path: ./code-terms.txt
-    description: A list of coding related terms.
-    addWords: true
-  - name: mermaid-terms
-    path: ./mermaid-terms.txt
-    description: A list of terms related to the mermaid project.
-    addWords: true
-  - name: misc-terms
-    path: ./misc-terms.txt
-    description: A list of miscellaneous terms.
-  - name: 3rd-party-terms
-    path: ./libraries.txt
-    description: A list of 3rd party terms from dependencies.
-    addWords: true
-  - name: contributors
-    path: ./contributors.txt
-    description: A list of contributors to the mermaid project.
-    type: 'W'
-    addWords: true
-
-  # cspell:disable
-  - name: suggestions
-    words:
-      - none
-    suggestWords:
-      - seperator:separator
-      - vertice:vertex
-  # cspell:enable
-
-patterns:
-  - name: character-set-cyrillic
-    pattern: '/\p{Script_Extensions=Cyrillic}+/gu'
-  - name: svg-block
-    pattern: '<svg[\S\s]+?</svg>'
-  - name: json-property
-    pattern: '/"[\w/@-]+":/g'
-
-dictionaries:
-  - mermaid-terms
-  - suggestions
-  - contributors
-
-ignorePaths:
-  - '*.txt' # do not spell check local dictionaries
-
-# cspell:dictionary misc-terms

.cspell/libraries.txt

@@ -1,71 +0,0 @@
-# Add third party library terms below
-acyclicer
-Antlr
-Appli
-applitools
-Asciidoctor
-Astah
-automerge
-bilkent
-bisheng
-Blazor
-codedoc
-Codemia
-codepaths
-csstree
-cytoscape
-cytoscape-cose-bilkent
-dagre
-dagre-d3
-Deepdwn
-Docsify
-Docsy
-DokuWiki
-dompurify
-elkjs
-fontawesome
-Foswiki
-Gitea
-graphlib
-Grav
-iconify
-Inkdrop
-jiti
-jsdocs
-jsfiddle
-jsonschema
-katex
-khroma
-langium
-mathml
-matplotlib
-mdbook
-Mermerd
-mkdocs
-Nextra
-nodenext
-npmjs
-pageview
-pathe
-phpbb
-pixelmatch
-Podlite
-presetAttributify
-pyplot
-redmine
-rehype
-rscratch
-sparkline
-sphinxcontrib
-ssim
-stylis
-Swimm
-tsbuildinfo
-Tuleap
-Typora
-unocss
-unplugin
-unstub
-vite
-vitest
-Zune

.cspell/mermaid-terms.txt

@@ -1,39 +0,0 @@
-Adamiecki
-arrowend
-bmatrix
-braintree
-catmull
-compositTitleSize
-doublecircle
-elems
-gantt
-gitgraph
-gzipped
-knsv
-Knut
-marginx
-marginy
-Markdownish
-mermaidjs
-mindmap
-mindmaps
-multigraph
-nodesep
-NOTEGROUP
-Pinterest
-rankdir
-ranksep
-rect
-rects
-sandboxed
-siebling
-statediagram
-substate
-Sveidqvist
-unfixable
-Viewbox
-viewports
-visio
-vitepress
-xlink
-xychart

.cspell/misc-terms.txt

@@ -1 +0,0 @@
-newbranch

.esbuild/build.ts

@@ -1,8 +1,8 @@
 import { build } from 'esbuild';
 import { mkdir, writeFile } from 'node:fs/promises';
+import { MermaidBuildOptions, defaultOptions, getBuildConfig } from './util.js';
 import { packageOptions } from '../.build/common.js';
 import { generateLangium } from '../.build/generateLangium.js';
-import { MermaidBuildOptions, defaultOptions, getBuildConfig } from './util.js';
 
 const shouldVisualize = process.argv.includes('--visualize');
 
@@ -56,7 +56,7 @@ const main = async () => {
   await generateLangium();
   await mkdir('stats').catch(() => {});
   const packageNames = Object.keys(packageOptions) as (keyof typeof packageOptions)[];
-  // it should build `parser` before `mermaid` because it's a dependency
+  // it should build `parser` before `mermaid` because it's a dependecy
   for (const pkg of packageNames) {
     await buildPackage(pkg).catch(handler);
   }

.esbuild/server.ts

@@ -7,23 +7,37 @@ import chokidar from 'chokidar';
 import { generateLangium } from '../.build/generateLangium.js';
 import { packageOptions } from '../.build/common.js';
 
-const configs = Object.values(packageOptions).map(({ packageName }) =>
-  getBuildConfig({ ...defaultOptions, minify: false, core: false, entryName: packageName })
+const parserCtx = await context(
+  getBuildConfig({ ...defaultOptions, minify: false, core: false, entryName: 'parser' })
 );
-const mermaidIIFEConfig = getBuildConfig({
-  ...defaultOptions,
-  minify: false,
-  core: false,
-  entryName: 'mermaid',
-  format: 'iife',
-});
-configs.push(mermaidIIFEConfig);
-
-const contexts = await Promise.all(configs.map((config) => context(config)));
+const mermaidCtx = await context(
+  getBuildConfig({ ...defaultOptions, minify: false, core: false, entryName: 'mermaid' })
+);
+const mermaidIIFECtx = await context(
+  getBuildConfig({
+    ...defaultOptions,
+    minify: false,
+    core: false,
+    entryName: 'mermaid',
+    format: 'iife',
+  })
+);
+const externalCtx = await context(
+  getBuildConfig({
+    ...defaultOptions,
+    minify: false,
+    core: false,
+    entryName: 'mermaid-example-diagram',
+  })
+);
+const zenumlCtx = await context(
+  getBuildConfig({ ...defaultOptions, minify: false, core: false, entryName: 'mermaid-zenuml' })
+);
+const contexts = [parserCtx, mermaidCtx, mermaidIIFECtx, externalCtx, zenumlCtx];
 
 const rebuildAll = async () => {
   console.time('Rebuild time');
-  await Promise.all(contexts.map((ctx) => ctx.rebuild())).catch((e) => console.error(e));
+  await Promise.all(contexts.map((ctx) => ctx.rebuild()));
   console.timeEnd('Rebuild time');
 };
 

.esbuild/util.ts

@@ -65,9 +65,6 @@ export const getBuildConfig = (options: MermaidBuildOptions): BuildOptions => {
     minify,
     logLevel: 'info',
     chunkNames: `chunks/${outFileName}/[name]-[hash]`,
-    define: {
-      'import.meta.vitest': 'undefined',
-    },
   });
 
   if (core) {

.eslintrc.cjs

@@ -63,24 +63,13 @@ module.exports = {
         minimumDescriptionLength: 10,
       },
     ],
-    '@typescript-eslint/naming-convention': [
-      'error',
-      {
-        selector: 'typeLike',
-        format: ['PascalCase'],
-        custom: {
-          regex: '^I[A-Z]',
-          match: false,
-        },
-      },
-    ],
     'json/*': ['error', 'allowComments'],
     '@cspell/spellchecker': [
       'error',
       {
-        checkIdentifiers: true,
-        checkStrings: true,
-        checkStringTemplates: true,
+        checkIdentifiers: false,
+        checkStrings: false,
+        checkStringTemplates: false,
       },
     ],
     'no-empty': [
@@ -159,19 +148,6 @@ module.exports = {
         '@typescript-eslint/no-unused-vars': 'off',
       },
     },
-    {
-      files: ['*.spec.{ts,js}', 'tests/**', 'cypress/**/*.js'],
-      rules: {
-        '@cspell/spellchecker': [
-          'error',
-          {
-            checkIdentifiers: false,
-            checkStrings: false,
-            checkStringTemplates: false,
-          },
-        ],
-      },
-    },
     {
       files: ['*.html', '*.md', '**/*.md/*'],
       rules: {

.github/ISSUE_TEMPLATE/config.yml

@@ -3,9 +3,9 @@ contact_links:
   - name: GitHub Discussions
     url: https://github.com/mermaid-js/mermaid/discussions
     about: Ask the Community questions or share your own graphs in our discussions.
-  - name: Discord
-    url: https://discord.gg/AgrbSrBer3
-    about: Join our Community on Discord for Help and a casual chat.
+  - name: Slack
+    url: https://join.slack.com/t/mermaid-talk/shared_invite/enQtNzc4NDIyNzk4OTAyLWVhYjQxOTI2OTg4YmE1ZmJkY2Y4MTU3ODliYmIwOTY3NDJlYjA0YjIyZTdkMDMyZTUwOGI0NjEzYmEwODcwOTE
+    about: Join our Community on Slack for Help and a casual chat.
   - name: Documentation
     url: https://mermaid.js.org
     about: Read our documentation for all that Mermaid.js can offer.

.github/codecov.yaml

@@ -15,4 +15,3 @@ coverage:
       # Turing off for now as code coverage isn't stable and causes unnecessary build failures.
       # default:
       #   threshold: 2%
-    patch: off

.github/lychee.toml

@@ -34,14 +34,8 @@ exclude = [
 # Don't check files that are generated during the build via `pnpm docs:code`
 'packages/mermaid/src/docs/config/setup/*',
 
-# Ignore Discord invite
-"https://discord.gg",
-
-# BundlePhobia has frequent downtime
-"https://bundlephobia.com",
-
-# Chrome webstore redirect issue
-"https://chromewebstore.google.com"
+# Ignore slack invite
+"https://join.slack.com/"
 ]
 
 # Exclude all private IPs from checking.

.github/pull_request_template.md

@@ -12,7 +12,7 @@ Describe the way your implementation works or what design decisions you made if
 
 Make sure you
 
-- [ ] :book: have read the [contribution guidelines](https://mermaid.js.org/community/contributing.html)
+- [ ] :book: have read the [contribution guidelines](https://github.com/mermaid-js/mermaid/blob/develop/CONTRIBUTING.md)
 - [ ] :computer: have added necessary unit/e2e tests.
-- [ ] :notebook: have added documentation. Make sure [`MERMAID_RELEASE_VERSION`](https://mermaid.js.org/community/contributing.html#update-documentation) is used for all new features.
+- [ ] :notebook: have added documentation. Make sure [`MERMAID_RELEASE_VERSION`](https://github.com/mermaid-js/mermaid/blob/develop/packages/mermaid/src/docs/community/development.md#3-update-documentation) is used for all new features.
 - [ ] :bookmark: targeted `develop` branch

.github/workflows/build-docs.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: pnpm
-          node-version-file: '.node-version'
+          node-version: 18
 
       - name: Install Packages
         run: pnpm install --frozen-lockfile

.github/workflows/build.yml

@@ -15,17 +15,20 @@ permissions:
 jobs:
   build-mermaid:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.x]
     steps:
       - uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v2
         # uses version from "packageManager" field in package.json
 
-      - name: Setup Node.js
+      - name: Setup Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
           cache: pnpm
-          node-version-file: '.node-version'
+          node-version: ${{ matrix.node-version }}
 
       - name: Install Packages
         run: |

.github/workflows/e2e-applitools.yml

@@ -21,24 +21,24 @@ env:
 jobs:
   e2e-applitools:
     runs-on: ubuntu-latest
-    container:
-      image: cypress/browsers:node-20.11.0-chrome-121.0.6167.85-1-ff-120.0-edge-121.0.2277.83-1
-      options: --user 1001
+    strategy:
+      matrix:
+        node-version: [18.x]
     steps:
       - if: ${{ ! env.USE_APPLI }}
         name: Warn if not using Applitools
         run: |
-          echo "::error,title=Not using Applitools::APPLITOOLS_API_KEY is empty, disabling Applitools for this run."
+          echo "::error,title=Not using Applitols::APPLITOOLS_API_KEY is empty, disabling Applitools for this run."
 
       - uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v2
         # uses version from "packageManager" field in package.json
 
-      - name: Setup Node.js
+      - name: Setup Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
-          node-version-file: '.node-version'
+          node-version: ${{ matrix.node-version }}
 
       - if: ${{ env.USE_APPLI }}
         name: Notify applitools of new batch

.github/workflows/e2e.yml

@@ -1,71 +1,20 @@
-# We use github cache to save snapshots between runs.
-# For PRs and MergeQueues, the target commit is used, and for push events, github.event.previous is used.
-# If a snapshot for a given Hash is not found, we checkout that commit, run the tests and cache the snapshots.
-# These are then downloaded before running the E2E, providing the reference snapshots.
-# If there are any errors, the diff image is uploaded to artifacts, and the user is notified.
-
 name: E2E
 
 on:
   push:
-    branches-ignore:
-      - 'gh-readonly-queue/**'
   pull_request:
   merge_group:
 
 permissions:
   contents: read
 
-env:
-  # For PRs and MergeQueues, the target commit is used, and for push events, github.event.previous is used.
-  targetHash: ${{ github.event.pull_request.base.sha || github.event.merge_group.base_sha || (github.event.before == '0000000000000000000000000000000000000000' && 'develop' || github.event.before)  }}
-
 jobs:
-  cache:
-    runs-on: ubuntu-latest
-    container:
-      image: cypress/browsers:node-20.11.0-chrome-121.0.6167.85-1-ff-120.0-edge-121.0.2277.83-1
-      options: --user 1001
-    steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.node-version'
-      - name: Cache snapshots
-        id: cache-snapshot
-        uses: actions/cache@v4
-        with:
-          save-always: true
-          path: ./cypress/snapshots
-          key: ${{ runner.os }}-snapshots-${{ env.targetHash }}
-
-      # If a snapshot for a given Hash is not found, we checkout that commit, run the tests and cache the snapshots.
-      - name: Switch to base branch
-        if: ${{ steps.cache-snapshot.outputs.cache-hit != 'true' }}
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.targetHash }}
-
-      - name: Cypress run
-        uses: cypress-io/github-action@v4
-        id: cypress-snapshot-gen
-        if: ${{ steps.cache-snapshot.outputs.cache-hit != 'true' }}
-        with:
-          start: pnpm run dev
-          wait-on: 'http://localhost:9000'
-          browser: chrome
-
   e2e:
     runs-on: ubuntu-latest
-    container:
-      image: cypress/browsers:node-20.11.0-chrome-121.0.6167.85-1-ff-120.0-edge-121.0.2277.83-1
-      options: --user 1001
-    needs: cache
     strategy:
       fail-fast: false
       matrix:
+        node-version: [18.x]
         containers: [1, 2, 3, 4]
     steps:
       - uses: actions/checkout@v4
@@ -73,18 +22,10 @@ jobs:
       - uses: pnpm/action-setup@v2
         # uses version from "packageManager" field in package.json
 
-      - name: Setup Node.js
+      - name: Setup Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
-          node-version-file: '.node-version'
-
-      # These cached snapshots are downloaded, providing the reference snapshots.
-      - name: Cache snapshots
-        id: cache-snapshot
-        uses: actions/cache/restore@v3
-        with:
-          path: ./cypress/snapshots
-          key: ${{ runner.os }}-snapshots-${{ env.targetHash }}
+          node-version: ${{ matrix.node-version }}
 
       # Install NPM dependencies, cache them correctly
       # and run all Cypress tests
@@ -97,7 +38,6 @@ jobs:
         with:
           start: pnpm run dev:coverage
           wait-on: 'http://localhost:9000'
-          browser: chrome
           # Disable recording if we don't have an API key
           # e.g. if this action was run from a fork
           record: ${{ secrets.CYPRESS_RECORD_KEY != '' }}
@@ -106,7 +46,6 @@ jobs:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           VITEST_COVERAGE: true
           CYPRESS_COMMIT: ${{ github.sha }}
-
       - name: Upload Coverage to Codecov
         uses: codecov/codecov-action@v3
         # Run step only pushes to develop and pull_requests
@@ -118,55 +57,9 @@ jobs:
           fail_ci_if_error: false
           verbose: true
           token: 6845cc80-77ee-4e17-85a1-026cd95e0766
-
-      # We upload the artifacts into numbered archives to prevent overwriting
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
-        if: ${{ always() }}
-        with:
-          name: snapshots-${{ matrix.containers }}
-          retention-days: 1
-          path: ./cypress/snapshots
-
-  combineArtifacts:
-    needs: e2e
-    runs-on: ubuntu-latest
-    if: ${{ always() }}
-    steps:
-      # Download all snapshot artifacts and merge them into a single folder
-      - name: Download All Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: snapshots
-          pattern: snapshots-*
-          merge-multiple: true
-
-      # For successful push events, we save the snapshots cache
-      - name: Save snapshots cache
-        id: cache-upload
-        if: ${{ github.event_name == 'push' && needs.e2e.result != 'failure' }}
-        uses: actions/cache/save@v3
-        with:
-          path: ./snapshots
-          key: ${{ runner.os }}-snapshots-${{ github.event.after }}
-
-      - name: Flatten images to a folder
-        if: ${{ needs.e2e.result == 'failure'  }}
-        run: |
-          mkdir errors
-          cd snapshots
-          find . -mindepth 2 -type d -name "*__diff_output__*" -exec sh -c 'mv "$0"/*.png ../errors/' {} \;
-
-      - name: Upload Error snapshots
-        if: ${{ needs.e2e.result == 'failure' }}
-        uses: actions/upload-artifact@v4
-        id: upload-artifacts
+        uses: actions/upload-artifact@v3
+        if: ${{ failure() && steps.cypress.conclusion == 'failure' }}
         with:
           name: error-snapshots
-          retention-days: 10
-          path: errors/
-
-      - name: Notify Users
-        if: ${{ needs.e2e.result == 'failure' }}
-        run: |
-          echo "::error title=Visual tests failed::You can view images that failed by downloading the error-snapshots artifact: ${{ steps.upload-artifacts.outputs.artifact-url }}"
+          path: cypress/snapshots/**/__diff_output__/*

.github/workflows/link-checker.yml

@@ -36,7 +36,7 @@ jobs:
           restore-keys: cache-lychee-
 
       - name: Link Checker
-        uses: lycheeverse/lychee-action@v1.9.3
+        uses: lycheeverse/lychee-action@v1.8.0
         with:
           args: >-
             --config .github/lychee.toml

.github/workflows/lint.yml

@@ -16,17 +16,20 @@ permissions:
 jobs:
   lint:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.x]
     steps:
       - uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v2
         # uses version from "packageManager" field in package.json
 
-      - name: Setup Node.js
+      - name: Setup Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
           cache: pnpm
-          node-version-file: '.node-version'
+          node-version: ${{ matrix.node-version }}
 
       - name: Install Packages
         run: |

.github/workflows/publish-docs.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: pnpm
-          node-version-file: '.node-version'
+          node-version: 18
 
       - name: Install Packages
         run: pnpm install --frozen-lockfile

.github/workflows/release-draft.yml

@@ -3,7 +3,7 @@ name: Draft Release
 on:
   push:
     branches:
-      - master
+      - develop
 
 permissions:
   contents: read

.github/workflows/release-preview-publish.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: pnpm
-          node-version-file: '.node-version'
+          node-version: 18.x
 
       - name: Install Packages
         run: |

.github/workflows/release-publish.yml

@@ -14,11 +14,11 @@ jobs:
       - uses: pnpm/action-setup@v2
         # uses version from "packageManager" field in package.json
 
-      - name: Setup Node.js
+      - name: Setup Node.js v18
         uses: actions/setup-node@v4
         with:
           cache: pnpm
-          node-version-file: '.node-version'
+          node-version: 18.x
 
       - name: Install Packages
         run: |

.github/workflows/test.yml

@@ -8,17 +8,20 @@ permissions:
 jobs:
   unit-test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.x]
     steps:
       - uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v2
         # uses version from "packageManager" field in package.json
 
-      - name: Setup Node.js
+      - name: Setup Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
           cache: pnpm
-          node-version-file: '.node-version'
+          node-version: ${{ matrix.node-version }}
 
       - name: Install Packages
         run: |

.github/workflows/update-browserlist.yml

@@ -9,17 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
-      - run: npx update-browserslist-db@latest
+      - run: npx browserslist@latest --update-db
       - name: Commit changes
         uses: EndBug/add-and-commit@v9
         with:
           author_name: ${{ github.actor }}
           author_email: ${{ github.actor }}@users.noreply.github.com
           message: 'chore: update browsers list'
-          push: false
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
-        with:
-          branch: update-browserslist
-          title: Update Browserslist

.gitignore

@@ -47,7 +47,6 @@ stats/
 demos/dev/**
 !/demos/dev/example.html
 !/demos/dev/reload.js
-tsx-0/**
 
 # autogenereated by langium-cli
-generated/
+generated/

.lintstagedrc.mjs

@@ -6,6 +6,6 @@ export default {
     // https://prettier.io/docs/en/cli.html#--cache
     'prettier --write',
   ],
-  '.cspell/*.txt': ['tsx scripts/fixCSpell.ts'],
+  'cSpell.json': ['ts-node-esm scripts/fixCSpell.ts'],
   '**/*.jison': ['pnpm -w run lint:jison'],
 };

.node-version

@@ -1 +0,0 @@
-v20.11.1

.npmrc

@@ -1,4 +1,2 @@
-registry=https://registry.npmjs.org
 auto-install-peers=true
 strict-peer-dependencies=false
-package-import-method=clone-or-copy

.prettierignore

@@ -1,7 +1,6 @@
 dist
 cypress/platform/xss3.html
 .cache
-.pnpm-store
 coverage
 # Autogenerated by PNPM
 pnpm-lock.yaml
@@ -11,8 +10,6 @@ stats
 .nyc_output
 # Autogenerated by `pnpm run --filter mermaid types:build-config`
 packages/mermaid/src/config.type.ts
+
 # autogenereated by langium-cli
 generated/
-# Ignore the files creates in /demos/dev except for example.html
-demos/dev/**
-!/demos/dev/example.html

.vite/build.ts

@@ -74,9 +74,6 @@ export const getBuildConfig = ({ minify, core, watch, entryName }: BuildOptions)
         output,
       },
     },
-    define: {
-      'import.meta.vitest': 'undefined',
-    },
     resolve: {
       extensions: [],
     },

.vite/server.ts

@@ -1,7 +1,6 @@
 import express from 'express';
 import cors from 'cors';
 import { createServer as createViteServer } from 'vite';
-import { packageOptions } from '../.build/common.js';
 
 async function createServer() {
   const app = express();
@@ -15,9 +14,10 @@ async function createServer() {
   });
 
   app.use(cors());
-  for (const { packageName } of Object.values(packageOptions)) {
-    app.use(express.static(`./packages/${packageName}/dist`));
-  }
+  app.use(express.static('./packages/parser/dist'));
+  app.use(express.static('./packages/mermaid/dist'));
+  app.use(express.static('./packages/mermaid-zenuml/dist'));
+  app.use(express.static('./packages/mermaid-example-diagram/dist'));
   app.use(vite.middlewares);
   app.use(express.static('demos'));
   app.use(express.static('cypress/platform'));

.vscode/extensions.json

@@ -2,7 +2,7 @@
   "recommendations": [
     "dbaeumer.vscode-eslint",
     "esbenp.prettier-vscode",
-    "vitest.explorer",
+    "zixuanchen.vitest-explorer",
     "luniclynx.bison"
   ]
 }

.vscode/launch.json

@@ -18,8 +18,7 @@
       "type": "node",
       "request": "launch",
       "args": ["scripts/docs.cli.mts"],
-      // we'll need to change this to --import in Node.JS v20.6.0 and up
-      "runtimeArgs": ["--loader", "tsx/esm"],
+      "runtimeArgs": ["--loader", "ts-node/esm"],
       "cwd": "${workspaceRoot}/packages/mermaid",
       "skipFiles": ["<node_internals>/**", "**/node_modules/**"],
       "smartStep": true,

CONTRIBUTING.md

@@ -1 +0,0 @@
-./packages/mermaid/src/docs/community/contributing.md

CONTRIBUTING.md

@@ -0,0 +1,78 @@
+# Contributing
+
+Please read in detail about how to contribute documentation and code on the [Mermaid documentation site.](https://mermaid-js.github.io/mermaid/#/development)
+
+---
+
+# Mermaid contribution cheat-sheet
+
+## Requirements
+
+- [volta](https://volta.sh/) to manage node versions.
+- [Node.js](https://nodejs.org/en/). `volta install node`
+- [pnpm](https://pnpm.io/) package manager. `volta install pnpm`
+
+## Development Installation
+
+If you don't have direct access to push to mermaid repositories, make a fork first. Then clone. Or clone directly from mermaid-js:
+
+```bash
+git clone git@github.com:mermaid-js/mermaid.git
+cd mermaid
+```
+
+Install required packages:
+
+```bash
+# npx is required for first install as volta support for pnpm is not added yet.
+npx pnpm install
+pnpm test # run unit tests
+pnpm dev # starts a dev server
+```
+
+Open <http://localhost:9000> in your browser after starting the dev server.
+You can also duplicate the `example.html` file in `demos/dev`, rename it and add your own mermaid code to it.
+That will be served at <http://localhost:9000/dev/your-file-name.html>.
+
+### Docker
+
+If you are using docker and docker-compose, you have self-documented `run` bash script, which is a convenient alias for docker-compose commands:
+
+```bash
+./run install # npx pnpm install
+./run test # pnpm test
+```
+
+## Testing
+
+```bash
+# Run unit test
+pnpm test
+# Run unit test in watch mode
+pnpm test:watch
+# Run E2E test
+pnpm e2e
+# Debug E2E tests
+pnpm dev
+pnpm cypress:open # in another terminal
+```
+
+## Branch name format:
+
+```text
+   [feature | bug | chore | docs]/[issue number]_[short description using dashes ('-') or underscores ('_') instead of spaces]
+```
+
+eg: `feature/2945_state-diagram-new-arrow-florbs`, `bug/1123_fix_random_ugly_red_text`
+
+## Documentation
+
+Documentation is necessary for all non bugfix/refactoring changes.
+
+Only make changes to files that are in [`/packages/mermaid/src/docs`](packages/mermaid/src/docs)
+
+**_DO NOT CHANGE FILES IN `/docs` MANUALLY_**
+
+The `/docs` folder will be rebuilt and committed as part of a pre-commit hook.
+
+[Join our slack community if you want closer contact!](https://join.slack.com/t/mermaid-talk/shared_invite/enQtNzc4NDIyNzk4OTAyLWVhYjQxOTI2OTg4YmE1ZmJkY2Y4MTU3ODliYmIwOTY3NDJlYjA0YjIyZTdkMDMyZTUwOGI0NjEzYmEwODcwOTE)

Dockerfile

@@ -1,2 +0,0 @@
-FROM node:20.11.1-alpine3.19 AS base
-RUN wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.shrc" SHELL="$(which sh)" sh -

README.md

@@ -15,7 +15,7 @@ Generate diagrams from markdown-like text.
 <a href="https://mermaid.live/"><b>Live Editor!</b></a>
 </p>
 <p align="center">
- <a href="https://mermaid.js.org">📖 Documentation</a> | <a href="https://mermaid.js.org/intro/">🚀 Getting Started</a> | <a href="https://www.jsdelivr.com/package/npm/mermaid">🌐 CDN</a> | <a href="https://discord.gg/AgrbSrBer3" title="Discord invite">🙌 Join Us</a>
+ <a href="https://mermaid.js.org">📖 Documentation</a> | <a href="https://mermaid.js.org/intro/">🚀 Getting Started</a> | <a href="https://www.jsdelivr.com/package/npm/mermaid">🌐 CDN</a> | <a href="https://join.slack.com/t/mermaid-talk/shared_invite/enQtNzc4NDIyNzk4OTAyLWVhYjQxOTI2OTg4YmE1ZmJkY2Y4MTU3ODliYmIwOTY3NDJlYjA0YjIyZTdkMDMyZTUwOGI0NjEzYmEwODcwOTE" title="Slack invite">🙌 Join Us</a>
 </p>
 <p align="center">
 <a href="./README.zh-CN.md">简体中文</a>
@@ -33,7 +33,7 @@ Try Live Editor previews of future releases: <a href="https://develop.git.mermai
 [![Coverage Status](https://codecov.io/github/mermaid-js/mermaid/branch/develop/graph/badge.svg)](https://app.codecov.io/github/mermaid-js/mermaid/tree/develop)
 [![CDN Status](https://img.shields.io/jsdelivr/npm/hm/mermaid)](https://www.jsdelivr.com/package/npm/mermaid)
 [![NPM Downloads](https://img.shields.io/npm/dm/mermaid)](https://www.npmjs.com/package/mermaid)
-[![Join our Discord!](https://img.shields.io/static/v1?message=join%20chat&color=9cf&logo=discord&label=discord)](https://discord.gg/AgrbSrBer3)
+[![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)
 [![Twitter Follow](https://img.shields.io/badge/Social-mermaidjs__-blue?style=social&logo=X)](https://twitter.com/mermaidjs_)
 
 <img src="./img/header.png" alt="" />
@@ -42,7 +42,7 @@ Try Live Editor previews of future releases: <a href="https://develop.git.mermai
 
 **Thanks to all involved, people committing pull requests, people answering questions! 🙏**
 
-<a href="https://mermaid.js.org/landing/"><img src="https://github.com/mermaid-js/mermaid/blob/master/docs/intro/img/book-banner-post-release.jpg" alt="Explore Mermaid.js in depth, with real-world examples, tips & tricks from the creator... The first official book on Mermaid is available for purchase. Check it out!"></a>
+<a href="https://mermaid-js.github.io/mermaid/landing/"><img src="https://github.com/mermaid-js/mermaid/blob/master/docs/intro/img/book-banner-post-release.jpg" alt="Explore Mermaid.js in depth, with real-world examples, tips & tricks from the creator... The first official book on Mermaid is available for purchase. Check it out!"></a>
 
 ## Table of content
 
@@ -53,7 +53,7 @@ Try Live Editor previews of future releases: <a href="https://develop.git.mermai
 - [Examples](#examples)
 - [Release](#release)
 - [Related projects](#related-projects)
-- [Contributors](#contributors---)
+- [Contributors](#contributors)
 - [Security and safe diagrams](#security-and-safe-diagrams)
 - [Reporting vulnerabilities](#reporting-vulnerabilities)
 - [Appreciation](#appreciation)
@@ -74,12 +74,12 @@ Mermaid addresses this problem by enabling users to create easily modifiable dia
 <br/>
 
 Mermaid allows even non-programmers to easily create detailed diagrams through the [Mermaid Live Editor](https://mermaid.live/).<br/>
-For video tutorials, visit our [Tutorials](https://mermaid.js.org/ecosystem/tutorials.html) page.
-Use Mermaid with your favorite applications, check out the list of [Integrations and Usages of Mermaid](https://mermaid.js.org/ecosystem/integrations-community.html).
+For video tutorials, visit our [Tutorials](./docs/config/Tutorials.md) page.
+Use Mermaid with your favorite applications, check out the list of [Integrations and Usages of Mermaid](./docs/ecosystem/integrations-community.md).
 
-You can also use Mermaid within [GitHub](https://github.blog/2022-02-14-include-diagrams-markdown-files-mermaid/) as well many of your other favorite applications—check out the list of [Integrations and Usages of Mermaid](https://mermaid.js.org/ecosystem/integrations-community.html).
+You can also use Mermaid within [GitHub](https://github.blog/2022-02-14-include-diagrams-markdown-files-mermaid/) as well many of your other favorite applications—check out the list of [Integrations and Usages of Mermaid](./docs/ecosystem/integrations-community.md).
 
-For a more detailed introduction to Mermaid and some of its more basic uses, look to the [Beginner's Guide](https://mermaid.js.org/intro/getting-started.html), [Usage](https://mermaid.js.org/config/usage.html) and [Tutorials](https://mermaid.js.org/ecosystem/tutorials.html).
+For a more detailed introduction to Mermaid and some of its more basic uses, look to the [Beginner's Guide](./docs/intro/getting-started.md), [Usage](./docs/config/usage.md) and [Tutorials](./docs/config/Tutorials.md).
 
 In our release process we rely heavily on visual regression tests using [applitools](https://applitools.com/). Applitools is a great service which has been easy to use and integrate with our tests.
 
@@ -91,11 +91,11 @@ In our release process we rely heavily on visual regression tests using [applito
 
 ## Examples
 
-**The following are some examples of the diagrams, charts and graphs that can be made using Mermaid. Click here to jump into the [text syntax](https://mermaid.js.org/intro/syntax-reference.html).**
+**The following are some examples of the diagrams, charts and graphs that can be made using Mermaid. Click here to jump into the [text syntax](https://mermaid-js.github.io/mermaid/#/n00b-syntaxReference).**
 
 <!-- <Flowchart> -->
 
-### Flowchart [<a href="https://mermaid.js.org/syntax/flowchart.html">docs</a> - <a href="https://mermaid.live/edit#pako:eNpNkMtqwzAQRX9FzKqFJK7t1km8KDQP6KJQSLOLvZhIY1tgS0GWmgbb_165IaFaiXvOFTPqgGtBkEJR6zOv0Fj2scsU8-ft8I5G5Gw6fe339GN7tnrYaafE45WvRsLW3Ya4bKVWwzVe_xU-FfVsc9hR62rLwvw_2591z7Y3FuUwgYZMg1L4ObrRzMBW1FAGqb8KKtCLGWRq8Ko7CbS0FdJqA2mBdUsTQGf110VxSK1xdJM2EkuDzd2qNQrypQ7s5TQuXcrW-ie5VoUsx9yZ2seVtac2DYIRz0ppK3eccd0ErRTjD1XfyyRIomSBUUzJPMaXOBb8GC4XRfQcFmL-FEYIwzD8AggvcHE">live editor</a>]
+### Flowchart [<a href="https://mermaid-js.github.io/mermaid/#/flowchart">docs</a> - <a href="https://mermaid.live/edit#pako:eNpNkMtqwzAQRX9FzKqFJK7t1km8KDQP6KJQSLOLvZhIY1tgS0GWmgbb_165IaFaiXvOFTPqgGtBkEJR6zOv0Fj2scsU8-ft8I5G5Gw6fe339GN7tnrYaafE45WvRsLW3Ya4bKVWwzVe_xU-FfVsc9hR62rLwvw_2591z7Y3FuUwgYZMg1L4ObrRzMBW1FAGqb8KKtCLGWRq8Ko7CbS0FdJqA2mBdUsTQGf110VxSK1xdJM2EkuDzd2qNQrypQ7s5TQuXcrW-ie5VoUsx9yZ2seVtac2DYIRz0ppK3eccd0ErRTjD1XfyyRIomSBUUzJPMaXOBb8GC4XRfQcFmL-FEYIwzD8AggvcHE">live editor</a>]
 
 ```
 flowchart LR
@@ -115,12 +115,12 @@ C -->|One| D[Result 1]
 C -->|Two| E[Result 2]
 ```
 
-### Sequence diagram [<a href="https://mermaid.js.org/syntax/sequenceDiagram.html">docs</a> - <a href="https://mermaid.live/edit#pako:eNo9kMluwjAQhl_F-AykQMuSA1WrbuLQQ3v1ZbAnsVXHkzrjVhHi3etQwKfRv4w-z0FqMihL2eF3wqDxyUEdoVHhwTuNk-12RzaU4g29JzHMY2HpV0BE0VO6V8ETtdkGz1Zb1F8qiPyG5LX84mrLAmpwoWNh-5a0pWCiAxUwGBXeiVHEU4oq8V_6AHYUwAu2lLLTjVQ4bc1rT2yleI0IfJG320faZ9ABbk-Jz3hZnFxBduR9L2oiM5Jj2WBswJn8-cMArSRbbFDJMo8GK0ielVThmKOpNcD4bBxTlGUFvsOxhMT02QctS44JL6HzAS-iJzCYOwfJfTscunYd542aQuXqQU_RZ9kyt11ZFIM9rR3btJ9qaorOGQuR7c9mWSznyzXMF7hcLeBusTB6P9usq_ntrDKrm9kc5PF4_AMJE56Z">live editor</a>]
+### Sequence diagram [<a href="https://mermaid-js.github.io/mermaid/#/sequenceDiagram">docs</a> - <a href="https://mermaid.live/edit#pako:eNo9kMluwjAQhl_F-AykQMuSA1WrbuLQQ3v1ZbAnsVXHkzrjVhHi3etQwKfRv4w-z0FqMihL2eF3wqDxyUEdoVHhwTuNk-12RzaU4g29JzHMY2HpV0BE0VO6V8ETtdkGz1Zb1F8qiPyG5LX84mrLAmpwoWNh-5a0pWCiAxUwGBXeiVHEU4oq8V_6AHYUwAu2lLLTjVQ4bc1rT2yleI0IfJG320faZ9ABbk-Jz3hZnFxBduR9L2oiM5Jj2WBswJn8-cMArSRbbFDJMo8GK0ielVThmKOpNcD4bBxTlGUFvsOxhMT02QctS44JL6HzAS-iJzCYOwfJfTscunYd542aQuXqQU_RZ9kyt11ZFIM9rR3btJ9qaorOGQuR7c9mWSznyzXMF7hcLeBusTB6P9usq_ntrDKrm9kc5PF4_AMJE56Z">live editor</a>]
 
 ```
 sequenceDiagram
 Alice->>John: Hello John, how are you?
-loop HealthCheck
+loop Healthcheck
     John->>John: Fight against hypochondria
 end
 Note right of John: Rational thoughts!
@@ -132,7 +132,7 @@ Bob-->>John: Jolly good!
 ```mermaid
 sequenceDiagram
 Alice->>John: Hello John, how are you?
-loop HealthCheck
+loop Healthcheck
     John->>John: Fight against hypochondria
 end
 Note right of John: Rational thoughts!
@@ -141,7 +141,7 @@ John->>Bob: How about you?
 Bob-->>John: Jolly good!
 ```
 
-### Gantt chart [<a href="https://mermaid.js.org/syntax/gantt.html">docs</a> - <a href="https://mermaid.live/edit#pako:eNp90cGOgyAQBuBXIZxtFbG29bbZ3fsmvXKZylhJEAyOTZrGd1_sto3xsHMBhu-HBO689hp5xS_giJQbsCbjHTv9jcp9-q63SKhZpb3DhMXSOIiE5ZkoNpnYZGXynh6U-4jBK7JnVfBYJo9QvgjtEya1cj8QwFq0TMz4lZqxTBg0hOF5m1jifI2Lf7Bc490CyxUu1rhc4GLGPOEdhg6Mjq92V44xxanFDhWv4lRjA6MlxZWbIh17DYTf2pAPvGrADphwGMmfbq7mFYURX-jLwCVA91bWg8YYunO69Y8vMgPFI2vvGnOZ-2Owsd0S9UOVpvP29mKoHc_b2nfpYHQLgdrrsUzLvDxALrHcS9hJqeuzOB6avBCN3mciBz5N0y_wxZ0J">live editor</a>]
+### Gantt chart [<a href="https://mermaid-js.github.io/mermaid/#/gantt">docs</a> - <a href="https://mermaid.live/edit#pako:eNp90cGOgyAQBuBXIZxtFbG29bbZ3fsmvXKZylhJEAyOTZrGd1_sto3xsHMBhu-HBO689hp5xS_giJQbsCbjHTv9jcp9-q63SKhZpb3DhMXSOIiE5ZkoNpnYZGXynh6U-4jBK7JnVfBYJo9QvgjtEya1cj8QwFq0TMz4lZqxTBg0hOF5m1jifI2Lf7Bc490CyxUu1rhc4GLGPOEdhg6Mjq92V44xxanFDhWv4lRjA6MlxZWbIh17DYTf2pAPvGrADphwGMmfbq7mFYURX-jLwCVA91bWg8YYunO69Y8vMgPFI2vvGnOZ-2Owsd0S9UOVpvP29mKoHc_b2nfpYHQLgdrrsUzLvDxALrHcS9hJqeuzOB6avBCN3mciBz5N0y_wxZ0J">live editor</a>]
 
 ```
 gantt
@@ -165,7 +165,7 @@ gantt
     Parallel 4   :         des6, after des4, 1d
 ```
 
-### Class diagram [<a href="https://mermaid.js.org/syntax/classDiagram.html">docs</a> - <a href="https://mermaid.live/edit#pako:eNpdkTFPwzAQhf-K5QlQ2zQJJG1UBaGWDYmBgYEwXO1LYuTEwXYqlZL_jt02asXm--690zvfgTLFkWaUSTBmI6DS0BTt2lfzkKx-p1PytEO9f1FtdaQkI2ulZNGuVqK1qEtgmOfk7BitSzKdOhg59XuNGgk0RDxed-_IOr6uf8cZ6UhTZ8bvHqS5ub1mr9svZPbjk6DEBlu7AQuXyBkx4gcvDk9cUMJq0XT_YaW0kNK5j-ufAoRzcihaQvLcoN4Jv50vvVxw_xrnD3RCG9QNCO4-8OgpqK1dpoJm7smxhF7agp6kfcfB4jMXVmmalW4tnFDorXrbt4xmVvc4is53GKFUwNF5DtTuO3-sShjrJjLVlqLyvNfS4drazmRB4NuzSti6386YagIjeA3a1rtlEiRRsoAoxiSN4SGOOduGy0UZ3YclT-dhBHQYhj8dc6_I">live editor</a>]
+### Class diagram [<a href="https://mermaid-js.github.io/mermaid/#/classDiagram">docs</a> - <a href="https://mermaid.live/edit#pako:eNpdkTFPwzAQhf-K5QlQ2zQJJG1UBaGWDYmBgYEwXO1LYuTEwXYqlZL_jt02asXm--690zvfgTLFkWaUSTBmI6DS0BTt2lfzkKx-p1PytEO9f1FtdaQkI2ulZNGuVqK1qEtgmOfk7BitSzKdOhg59XuNGgk0RDxed-_IOr6uf8cZ6UhTZ8bvHqS5ub1mr9svZPbjk6DEBlu7AQuXyBkx4gcvDk9cUMJq0XT_YaW0kNK5j-ufAoRzcihaQvLcoN4Jv50vvVxw_xrnD3RCG9QNCO4-8OgpqK1dpoJm7smxhF7agp6kfcfB4jMXVmmalW4tnFDorXrbt4xmVvc4is53GKFUwNF5DtTuO3-sShjrJjLVlqLyvNfS4drazmRB4NuzSti6386YagIjeA3a1rtlEiRRsoAoxiSN4SGOOduGy0UZ3YclT-dhBHQYhj8dc6_I">live editor</a>]
 
 ```
 classDiagram
@@ -207,7 +207,7 @@ class Class10 {
 
 ```
 
-### State diagram [<a href="https://mermaid.js.org/syntax/stateDiagram.html">docs</a> - <a href="https://mermaid.live/edit#pako:eNpdkEFvgzAMhf8K8nEqpYSNthx22Xbcqcexg0sCiZQQlDhIFeK_L8A6TfXp6fOz9ewJGssFVOAJSbwr7ByadGR1n8T6evpO0vQ1uZDSekOrXGFsPqJPO6q-2-imH8f_0TeHXm50lfelsAMjnEHFY6xpMdRAUhhRQxUlFy0GTTXU_RytYeAx-AdXZB1ULWovdoCB7OXWN1CRC-Ju-r3uz6UtchGHJqDbsPygU57iysb2reoWHpyOWBINvsqypb3vFMlw3TfWZF5xiY7keC6zkpUnZIUojwW-FAVvrvn51LLnvOXHQ84Q5nn-AVtLcwk">live editor</a>]
+### State diagram [<a href="https://mermaid-js.github.io/mermaid/#/stateDiagram">docs</a> - <a href="https://mermaid.live/edit#pako:eNpdkEFvgzAMhf8K8nEqpYSNthx22Xbcqcexg0sCiZQQlDhIFeK_L8A6TfXp6fOz9ewJGssFVOAJSbwr7ByadGR1n8T6evpO0vQ1uZDSekOrXGFsPqJPO6q-2-imH8f_0TeHXm50lfelsAMjnEHFY6xpMdRAUhhRQxUlFy0GTTXU_RytYeAx-AdXZB1ULWovdoCB7OXWN1CRC-Ju-r3uz6UtchGHJqDbsPygU57iysb2reoWHpyOWBINvsqypb3vFMlw3TfWZF5xiY7keC6zkpUnZIUojwW-FAVvrvn51LLnvOXHQ84Q5nn-AVtLcwk">live editor</a>]
 
 ```
 stateDiagram-v2
@@ -229,7 +229,7 @@ Moving --> Crash
 Crash --> [*]
 ```
 
-### Pie chart [<a href="https://mermaid.js.org/syntax/pie.html">docs</a> - <a href="https://mermaid.live/edit#pako:eNo9jsFugzAMhl8F-VzBgEEh13Uv0F1zcYkTIpEEBadShXj3BU3dzf_n77e8wxQUgYDVkvQSbsFsEgpRtEN_5i_kvzx05XiC-xvUHVzAUXRoVe7v0heFBJ7JkQSRR0Ua08ISpD-ymlaFTN_KcoggNC4bXQATh5-Xn0BwTPSWbhZNRPdvLQEV5dIO_FrPZ43dOJ-cgtfWnDzFJeOZed1EVZ3r0lie06Ocgqs2q2aMPD_HvuqbfsCmpf7aYte2anrU46Cbz1qr60fdIBzH8QvW9lkl">live editor</a>]
+### Pie chart [<a href="https://mermaid-js.github.io/mermaid/#/pie">docs</a> - <a href="https://mermaid.live/edit#pako:eNo9jsFugzAMhl8F-VzBgEEh13Uv0F1zcYkTIpEEBadShXj3BU3dzf_n77e8wxQUgYDVkvQSbsFsEgpRtEN_5i_kvzx05XiC-xvUHVzAUXRoVe7v0heFBJ7JkQSRR0Ua08ISpD-ymlaFTN_KcoggNC4bXQATh5-Xn0BwTPSWbhZNRPdvLQEV5dIO_FrPZ43dOJ-cgtfWnDzFJeOZed1EVZ3r0lie06Ocgqs2q2aMPD_HvuqbfsCmpf7aYte2anrU46Cbz1qr60fdIBzH8QvW9lkl">live editor</a>]
 
 ```
 pie
@@ -247,7 +247,7 @@ pie
 
 ### Git graph [experimental - <a href="https://mermaid.live/edit#pako:eNqNkMFugzAMhl8F-VyVAR1tOW_aA-zKxSSGRCMJCk6lCvHuNZPKZdM0n-zf3_8r8QIqaIIGMqnB8kfEybQ--y4VnLP8-9RF9Mpkmm40hmlnDKmvkPiH_kfS7nFo_VN0FAf6XwocQGgxa_nGsm1bYEOOWmik1dRjGrmF1q-Cpkkj07u2HCI0PY4zHQATh8-7V9BwTPSE3iwOEd1OjQE1iWkBvk_bzQY7s0Sq4Hs7bHqKo8iGeZqbPN_WR7mpSd1RHpvPVhuMbG7XOq_L-oJlRfW5wteq0qorrpe-PBW9Pr8UJcK6rg-BLYPQ">live editor</a>]
 
-### Bar chart (using gantt chart) [<a href="https://mermaid.js.org/syntax/gantt.html">docs</a> - <a href="https://mermaid.live/edit#pako:eNptkU1vhCAQhv8KIenNugiI4rkf6bmXpvEyFVxJFDYyNt1u9r8X63Z7WQ9m5pknLzieaBeMpQ3dg0dsPUkPOhwteXZIXmJcbCT3xMAxkuh8Z8kIEclyMIB209fqKcwTICFvG4IvFy_oLrZ-g9F26ILfQgvNFN94VaRXQ1iWqpumZBcu1J8p1E1TXDx59eQNr5LyEqjJn6hv5QnGNlxevZJmdLLpy5xJSzut45biYCfb0iaVxvawjNjS1p-TCguG16PvaIPzYjO67e3BwX6GiTY9jPFKH43DMF_hGMDY1J4oHg-_f8hFTJFd8L3br3yZx4QHxENsdrt1nO8dDstH3oVpF50ZYMbhU6ud4qoGLqyqBJRCmO6j0HXPZdGbihUc6Pmc0QP49xD-b5X69ZQv2gjO81IwzWqhC1lKrjJ6pA3nVS7SMiVjrKirWlYp5fs3osgrWeo00lorLWvOzz8JVbXm">live editor</a>]
+### Bar chart (using gantt chart) [<a href="https://mermaid-js.github.io/mermaid/#/gantt">docs</a> - <a href="https://mermaid.live/edit#pako:eNptkU1vhCAQhv8KIenNugiI4rkf6bmXpvEyFVxJFDYyNt1u9r8X63Z7WQ9m5pknLzieaBeMpQ3dg0dsPUkPOhwteXZIXmJcbCT3xMAxkuh8Z8kIEclyMIB209fqKcwTICFvG4IvFy_oLrZ-g9F26ILfQgvNFN94VaRXQ1iWqpumZBcu1J8p1E1TXDx59eQNr5LyEqjJn6hv5QnGNlxevZJmdLLpy5xJSzut45biYCfb0iaVxvawjNjS1p-TCguG16PvaIPzYjO67e3BwX6GiTY9jPFKH43DMF_hGMDY1J4oHg-_f8hFTJFd8L3br3yZx4QHxENsdrt1nO8dDstH3oVpF50ZYMbhU6ud4qoGLqyqBJRCmO6j0HXPZdGbihUc6Pmc0QP49xD-b5X69ZQv2gjO81IwzWqhC1lKrjJ6pA3nVS7SMiVjrKirWlYp5fs3osgrWeo00lorLWvOzz8JVbXm">live editor</a>]
 
 ```
 gantt
@@ -285,7 +285,7 @@ gantt
     5    : 0, 5
 ```
 
-### User Journey diagram [<a href="https://mermaid.js.org/syntax/userJourney.html">docs</a> - <a href="https://mermaid.live/edit#pako:eNplkMFuwjAQRH9l5TMiTVIC-FqqnjhxzWWJN4khsSN7XRSh_HsdKBVt97R6Mzsj-yoqq0hIAXCywRkaSwNxWHNHsB_hYt1ZmwYUfiueKtbWwIcFtjf5zgH2eCZgQgkrCXt64GgMg2fUzkvIn5Xd_V5COtMFvCH_62ht_5yk7MU8sn61HDTfxD8VYiF6cj1qFd94nWkpuKWYKWRcFdUYOi5FaaZoDYNCpnel2Toha-w8LQQGtofRVEKyC_Qw7TQ2DvsfV2dRUTy6Ch6H-UMb7TlGVtbUupl5cF3ELfPgZZLM8rLR3IbjsrJ94rVq0XH7uS2SIis2mOVUrHNc5bmqjul2U2evaa3WL2mGYpqmL2BGiho">live editor</a>]
+### User Journey diagram [<a href="https://mermaid-js.github.io/mermaid/#/user-journey">docs</a> - <a href="https://mermaid.live/edit#pako:eNplkMFuwjAQRH9l5TMiTVIC-FqqnjhxzWWJN4khsSN7XRSh_HsdKBVt97R6Mzsj-yoqq0hIAXCywRkaSwNxWHNHsB_hYt1ZmwYUfiueKtbWwIcFtjf5zgH2eCZgQgkrCXt64GgMg2fUzkvIn5Xd_V5COtMFvCH_62ht_5yk7MU8sn61HDTfxD8VYiF6cj1qFd94nWkpuKWYKWRcFdUYOi5FaaZoDYNCpnel2Toha-w8LQQGtofRVEKyC_Qw7TQ2DvsfV2dRUTy6Ch6H-UMb7TlGVtbUupl5cF3ELfPgZZLM8rLR3IbjsrJ94rVq0XH7uS2SIis2mOVUrHNc5bmqjul2U2evaa3WL2mGYpqmL2BGiho">live editor</a>]
 
 ```
   journey
@@ -311,7 +311,7 @@ gantt
       Sit down: 3: Me
 ```
 
-### C4 diagram [<a href="https://mermaid.js.org/syntax/c4.html">docs</a>]
+### C4 diagram [<a href="https://mermaid-js.github.io/mermaid/#/c4c">docs</a>]
 
 ```
 C4Context
@@ -405,7 +405,7 @@ The above command generates files into the `dist` folder and publishes them to <
 
 Mermaid is a growing community and is always accepting new contributors. There's a lot of different ways to help out and we're always looking for extra hands! Look at [this issue](https://github.com/mermaid-js/mermaid/issues/866) if you want to know where to start helping out.
 
-Detailed information about how to contribute can be found in the [contribution guide](https://mermaid.js.org/community/contributing.html)
+Detailed information about how to contribute can be found in the [contribution guide](CONTRIBUTING.md)
 
 ## Security and safe diagrams
 

README.zh-CN.md

@@ -15,7 +15,7 @@ Mermaid
 <a href="https://mermaid.live/"><b>实时编辑器!</b></a>
 </p>
 <p align="center">
- <a href="https://mermaid.js.org">📖 文档</a> | <a href="https://mermaid.js.org/intro/">🚀 入门</a> | <a href="https://www.jsdelivr.com/package/npm/mermaid">🌐 CDN</a> | <a href="https://discord.gg/AgrbSrBer3" title="Discord invite">🙌 加入我们</a>
+ <a href="https://mermaid.js.org">📖 文档</a> | <a href="https://mermaid.js.org/intro/">🚀 入门</a> | <a href="https://www.jsdelivr.com/package/npm/mermaid">🌐 CDN</a> | <a href="https://join.slack.com/t/mermaid-talk/shared_invite/enQtNzc4NDIyNzk4OTAyLWVhYjQxOTI2OTg4YmE1ZmJkY2Y4MTU3ODliYmIwOTY3NDJlYjA0YjIyZTdkMDMyZTUwOGI0NjEzYmEwODcwOTE" title="Slack invite">🙌 加入我们</a>
 </p>
 <p align="center">
 <a href="./README.md">English</a>
@@ -34,7 +34,7 @@ Mermaid
 [![Coverage Status](https://codecov.io/github/mermaid-js/mermaid/branch/develop/graph/badge.svg)](https://app.codecov.io/github/mermaid-js/mermaid/tree/develop)
 [![CDN Status](https://img.shields.io/jsdelivr/npm/hm/mermaid)](https://www.jsdelivr.com/package/npm/mermaid)
 [![NPM Downloads](https://img.shields.io/npm/dm/mermaid)](https://www.npmjs.com/package/mermaid)
-[![Join our Discord!](https://img.shields.io/static/v1?message=join%20chat&color=9cf&logo=discord&label=discord)](https://discord.gg/AgrbSrBer3)
+[![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)
 [![Twitter Follow](https://img.shields.io/badge/Social-mermaidjs__-blue?style=social&logo=X)](https://twitter.com/mermaidjs_)
 
 <img src="./img/header.png" alt="" />
@@ -43,7 +43,7 @@ Mermaid
 
 **感谢所有参与进来提交 PR，解答疑问的人们! 🙏**
 
-<a href="https://mermaid.js.org/landing/"><img src="https://github.com/mermaid-js/mermaid/blob/master/docs/intro/img/book-banner-post-release.jpg" alt="Explore Mermaid.js in depth, with real-world examples, tips & tricks from the creator... The first official book on Mermaid is available for purchase. Check it out!"></a>
+<a href="https://mermaid-js.github.io/mermaid/landing/"><img src="https://github.com/mermaid-js/mermaid/blob/master/docs/intro/img/book-banner-post-release.jpg" alt="Explore Mermaid.js in depth, with real-world examples, tips & tricks from the creator... The first official book on Mermaid is available for purchase. Check it out!"></a>
 
 ## 关于 Mermaid
 
@@ -57,20 +57,20 @@ Mermaid 是一个基于 Javascript 的图表绘制工具，通过解析类 Markd
 Mermaid 通过允许用户创建便于修改的图表来解决这一难题，它也可以作为生产脚本（或其他代码）的一部分。<br/>
 <br/>
 Mermaid 甚至能让非程序员也能通过 [Mermaid Live Editor](https://mermaid.live/) 轻松创建详细的图表。<br/>
-你可以访问 [教程](https://mermaid.js.org/ecosystem/tutorials.html) 来查看 Live Editor 的视频教程，也可以查看 [Mermaid 的集成和使用](https://mermaid.js.org/ecosystem/integrations-community.html) 这个清单来检查你的文档工具是否已经集成了 Mermaid 支持。
+你可以访问 [教程](./docs/config/Tutorials.md) 来查看 Live Editor 的视频教程，也可以查看 [Mermaid 的集成和使用](./docs/ecosystem/integrations-community.md) 这个清单来检查你的文档工具是否已经集成了 Mermaid 支持。
 
-如果想要查看关于 Mermaid 更详细的介绍及基础使用方式，可以查看 [入门指引](https://mermaid.js.org/intro/getting-started.html), [用法](https://mermaid.js.org/config/usage.html) 和 [教程](https://mermaid.js.org/ecosystem/tutorials.html).
+如果想要查看关于 Mermaid 更详细的介绍及基础使用方式，可以查看 [入门指引](./docs/intro/getting-started.md), [用法](./docs/config/usage.md) 和 [教程](./docs/config/Tutorials.md).
 
 <!-- </Main description> -->
 
 ## 示例
 
-**下面是一些可以使用 Mermaid 创建的图表示例。点击 [语法](https://mermaid.js.org/intro/syntax-reference.html) 查看详情。**
+**下面是一些可以使用 Mermaid 创建的图表示例。点击 [语法](https://mermaid-js.github.io/mermaid/#/n00b-syntaxReference) 查看详情。**
 
 <table>
 <!-- <Flowchart> -->
 
-### 流程图 [<a href="https://mermaid.js.org/syntax/flowchart.html">文档</a> - <a href="https://mermaid.live/edit#base64:eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0hhcmRdIC0tPnxUZXh0fCBCKFJvdW5kKVxuICAgIEIgLS0-IEN7RGVjaXNpb259XG4gICAgQyAtLT58T25lfCBEW1Jlc3VsdCAxXVxuICAgIEMgLS0-fFR3b3wgRVtSZXN1bHQgMl0iLCJtZXJtYWlkIjp7InRoZW1lIjoiZGVmYXVsdCJ9fQ">live editor</a>]
+### 流程图 [<a href="https://mermaid-js.github.io/mermaid/#/flowchart">文档</a> - <a href="https://mermaid.live/edit#base64:eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0hhcmRdIC0tPnxUZXh0fCBCKFJvdW5kKVxuICAgIEIgLS0-IEN7RGVjaXNpb259XG4gICAgQyAtLT58T25lfCBEW1Jlc3VsdCAxXVxuICAgIEMgLS0-fFR3b3wgRVtSZXN1bHQgMl0iLCJtZXJtYWlkIjp7InRoZW1lIjoiZGVmYXVsdCJ9fQ">live editor</a>]
 
 ```
 flowchart LR
@@ -88,12 +88,12 @@ C -->|One| D[Result 1]
 C -->|Two| E[Result 2]
 ```
 
-### 时序图 [<a href="https://mermaid.js.org/syntax/sequenceDiagram.html">文档</a> - <a href="https://mermaid.live/edit#base64:eyJjb2RlIjoic2VxdWVuY2VEaWFncmFtXG5BbGljZS0-PkpvaG46IEhlbGxvIEpvaG4sIGhvdyBhcmUgeW91P1xubG9vcCBIZWFsdGhjaGVja1xuICAgIEpvaG4tPj5Kb2huOiBGaWdodCBhZ2FpbnN0IGh5cG9jaG9uZHJpYVxuZW5kXG5Ob3RlIHJpZ2h0IG9mIEpvaG46IFJhdGlvbmFsIHRob3VnaHRzIVxuSm9obi0tPj5BbGljZTogR3JlYXQhXG5Kb2huLT4-Qm9iOiBIb3cgYWJvdXQgeW91P1xuQm9iLS0-PkpvaG46IEpvbGx5IGdvb2QhIiwibWVybWFpZCI6eyJ0aGVtZSI6ImRlZmF1bHQifX0">live editor</a>]
+### 时序图 [<a href="https://mermaid-js.github.io/mermaid/#/sequenceDiagram">文档</a> - <a href="https://mermaid.live/edit#base64:eyJjb2RlIjoic2VxdWVuY2VEaWFncmFtXG5BbGljZS0-PkpvaG46IEhlbGxvIEpvaG4sIGhvdyBhcmUgeW91P1xubG9vcCBIZWFsdGhjaGVja1xuICAgIEpvaG4tPj5Kb2huOiBGaWdodCBhZ2FpbnN0IGh5cG9jaG9uZHJpYVxuZW5kXG5Ob3RlIHJpZ2h0IG9mIEpvaG46IFJhdGlvbmFsIHRob3VnaHRzIVxuSm9obi0tPj5BbGljZTogR3JlYXQhXG5Kb2huLT4-Qm9iOiBIb3cgYWJvdXQgeW91P1xuQm9iLS0-PkpvaG46IEpvbGx5IGdvb2QhIiwibWVybWFpZCI6eyJ0aGVtZSI6ImRlZmF1bHQifX0">live editor</a>]
 
 ```
 sequenceDiagram
 Alice->>John: Hello John, how are you?
-loop HealthCheck
+loop Healthcheck
     John->>John: Fight against hypochondria
 end
 Note right of John: Rational thoughts!
@@ -105,7 +105,7 @@ Bob-->>John: Jolly good!
 ```mermaid
 sequenceDiagram
 Alice->>John: Hello John, how are you?
-loop HealthCheck
+loop Healthcheck
     John->>John: Fight against hypochondria
 end
 Note right of John: Rational thoughts!
@@ -114,7 +114,7 @@ John->>Bob: How about you?
 Bob-->>John: Jolly good!
 ```
 
-### 甘特图 [<a href="https://mermaid.js.org/syntax/gantt.html">文档</a> - <a href="https://mermaid.live/edit#base64:eyJjb2RlIjoiZ2FudHRcbnNlY3Rpb24gU2VjdGlvblxuQ29tcGxldGVkIDpkb25lLCAgICBkZXMxLCAyMDE0LTAxLTA2LDIwMTQtMDEtMDhcbkFjdGl2ZSAgICAgICAgOmFjdGl2ZSwgIGRlczIsIDIwMTQtMDEtMDcsIDNkXG5QYXJhbGxlbCAxICAgOiAgICAgICAgIGRlczMsIGFmdGVyIGRlczEsIDFkXG5QYXJhbGxlbCAyICAgOiAgICAgICAgIGRlczQsIGFmdGVyIGRlczEsIDFkXG5QYXJhbGxlbCAzICAgOiAgICAgICAgIGRlczUsIGFmdGVyIGRlczMsIDFkXG5QYXJhbGxlbCA0ICAgOiAgICAgICAgIGRlczYsIGFmdGVyIGRlczQsIDFkIiwibWVybWFpZCI6eyJ0aGVtZSI6ImRlZmF1bHQifX0">live editor</a>]
+### 甘特图 [<a href="https://mermaid-js.github.io/mermaid/#/gantt">文档</a> - <a href="https://mermaid.live/edit#base64:eyJjb2RlIjoiZ2FudHRcbnNlY3Rpb24gU2VjdGlvblxuQ29tcGxldGVkIDpkb25lLCAgICBkZXMxLCAyMDE0LTAxLTA2LDIwMTQtMDEtMDhcbkFjdGl2ZSAgICAgICAgOmFjdGl2ZSwgIGRlczIsIDIwMTQtMDEtMDcsIDNkXG5QYXJhbGxlbCAxICAgOiAgICAgICAgIGRlczMsIGFmdGVyIGRlczEsIDFkXG5QYXJhbGxlbCAyICAgOiAgICAgICAgIGRlczQsIGFmdGVyIGRlczEsIDFkXG5QYXJhbGxlbCAzICAgOiAgICAgICAgIGRlczUsIGFmdGVyIGRlczMsIDFkXG5QYXJhbGxlbCA0ICAgOiAgICAgICAgIGRlczYsIGFmdGVyIGRlczQsIDFkIiwibWVybWFpZCI6eyJ0aGVtZSI6ImRlZmF1bHQifX0">live editor</a>]
 
 ```
 gantt
@@ -138,7 +138,7 @@ gantt
     Parallel 4   :         des6, after des4, 1d
 ```
 
-### 类图 [<a href="https://mermaid.js.org/syntax/classDiagram.html">文档</a> - <a href="https://mermaid.live/edit#base64:eyJjb2RlIjoiY2xhc3NEaWFncmFtXG5DbGFzczAxIDx8LS0gQXZlcnlMb25nQ2xhc3MgOiBDb29sXG48PGludGVyZmFjZT4-IENsYXNzMDFcbkNsYXNzMDkgLS0-IEMyIDogV2hlcmUgYW0gaT9cbkNsYXNzMDkgLS0qIEMzXG5DbGFzczA5IC0tfD4gQ2xhc3MwN1xuQ2xhc3MwNyA6IGVxdWFscygpXG5DbGFzczA3IDogT2JqZWN0W10gZWxlbWVudERhdGFcbkNsYXNzMDEgOiBzaXplKClcbkNsYXNzMDEgOiBpbnQgY2hpbXBcbkNsYXNzMDEgOiBpbnQgZ29yaWxsYVxuY2xhc3MgQ2xhc3MxMCB7XG4gID4-c2VydmljZT4-XG4gIGludCBpZFxuICBzaXplKClcbn0iLCJtZXJtYWlkIjp7InRoZW1lIjoiZGVmYXVsdCJ9fQ">live editor</a>]
+### 类图 [<a href="https://mermaid-js.github.io/mermaid/#/classDiagram">文档</a> - <a href="https://mermaid.live/edit#base64:eyJjb2RlIjoiY2xhc3NEaWFncmFtXG5DbGFzczAxIDx8LS0gQXZlcnlMb25nQ2xhc3MgOiBDb29sXG48PGludGVyZmFjZT4-IENsYXNzMDFcbkNsYXNzMDkgLS0-IEMyIDogV2hlcmUgYW0gaT9cbkNsYXNzMDkgLS0qIEMzXG5DbGFzczA5IC0tfD4gQ2xhc3MwN1xuQ2xhc3MwNyA6IGVxdWFscygpXG5DbGFzczA3IDogT2JqZWN0W10gZWxlbWVudERhdGFcbkNsYXNzMDEgOiBzaXplKClcbkNsYXNzMDEgOiBpbnQgY2hpbXBcbkNsYXNzMDEgOiBpbnQgZ29yaWxsYVxuY2xhc3MgQ2xhc3MxMCB7XG4gID4-c2VydmljZT4-XG4gIGludCBpZFxuICBzaXplKClcbn0iLCJtZXJtYWlkIjp7InRoZW1lIjoiZGVmYXVsdCJ9fQ">live editor</a>]
 
 ```
 classDiagram
@@ -178,7 +178,7 @@ class Class10 {
 }
 ```
 
-### 状态图 [<a href="https://mermaid.js.org/syntax/stateDiagram.html">docs</a> - <a href="https://mermaid.live/edit#pako:eNpdkLsOwjAMRX-l8ojahTEDCzB26kgYrMYtkfJAqVMJVf13QiIKqqfr44d8vUDvFYGAiZHponEMaJv5KF2V4na4V01zqjrWxhSUZYapuEetn7UbCy16P_5HzwGnR6FZfpdCDZaCRa3SWcunQQI_yJIEkaSiAaNhCdKtqRUj--7lehAcItUQn-pnBMSAZtroVWn2YYOU07b4z29Y37gJVYk">live editor</a>]
+### 状态图 [[<a href="https://mermaid-js.github.io/mermaid/#/stateDiagram">docs</a> - <a href="https://mermaid.live/edit#pako:eNpdkLsOwjAMRX-l8ojahTEDCzB26kgYrMYtkfJAqVMJVf13QiIKqqfr44d8vUDvFYGAiZHponEMaJv5KF2V4na4V01zqjrWxhSUZYapuEetn7UbCy16P_5HzwGnR6FZfpdCDZaCRa3SWcunQQI_yJIEkaSiAaNhCdKtqRUj--7lehAcItUQn-pnBMSAZtroVWn2YYOU07b4z29Y37gJVYk">live editor</a>]
 
 ```
 stateDiagram-v2
@@ -200,7 +200,7 @@ Moving --> Crash
 Crash --> [*]
 ```
 
-### 饼图 [<a href="https://mermaid.js.org/syntax/pie.html">文档</a> - <a href="https://mermaid.live/edit#base64:eyJjb2RlIjoicGllXG5cIkRvZ3NcIiA6IDQyLjk2XG5cIkNhdHNcIiA6IDUwLjA1XG5cIlJhdHNcIiA6IDEwLjAxIiwibWVybWFpZCI6eyJ0aGVtZSI6ImRlZmF1bHQifX0">live editor</a>]
+### 饼图 [<a href="https://mermaid-js.github.io/mermaid/#/pie">文档</a> - <a href="https://mermaid.live/edit#base64:eyJjb2RlIjoicGllXG5cIkRvZ3NcIiA6IDQyLjk2XG5cIkNhdHNcIiA6IDUwLjA1XG5cIlJhdHNcIiA6IDEwLjAxIiwibWVybWFpZCI6eyJ0aGVtZSI6ImRlZmF1bHQifX0">live editor</a>]
 
 ```
 pie
@@ -218,7 +218,7 @@ pie
 
 ### Git 图 [实验特性 - <a href="https://mermaid.live/edit#base64:eyJjb2RlIjoiZ2l0R3JhcGg6XG5vcHRpb25zXG57XG4gICAgXCJub2RlU3BhY2luZ1wiOiAxNTAsXG4gICAgXCJub2RlUmFkaXVzXCI6IDEwXG59XG5lbmRcbmNvbW1pdFxuYnJhbmNoIG5ld2JyYW5jaFxuY2hlY2tvdXQgbmV3YnJhbmNoXG5jb21taXRcbmNvbW1pdFxuY2hlY2tvdXQgbWFzdGVyXG5jb21taXRcbmNvbW1pdFxubWVyZ2UgbmV3YnJhbmNoXG4iLCJtZXJtYWlkIjp7InRoZW1lIjoiZGVmYXVsdCJ9fQ">live editor</a>]
 
-### 用户体验旅程图 [<a href="https://mermaid.js.org/syntax/userJourney.html">文档</a> - <a href="https://mermaid.live/edit#pako:eNpljzEPgkAMhf9K05nFGJdbJXFiYmVpuKIncDVHL4QQ_ruHaILaqXnf63vpjLVYRoMAd4nB81R5SKNOO4ZiglFC6_wVLL3JwLU68XARUHnhTQcoqGVQJgMnAwV_5GSMj0HJhcHAcU_y7d7AYVUzOJP-ddyk3ydZGf0n66uldPqCPxWYYc-hJ2fTj_OqVqg3Tplo0mq5odhphZVfkpWiSjn5Go2GyBnGhyXl3NE1UI-moW7g5QkSoF5m">live editor</a>]
+### 用户体验旅程图 [<a href="https://mermaid-js.github.io/mermaid/#/user-journey">文档</a> - <a href="https://mermaid.live/edit#pako:eNpljzEPgkAMhf9K05nFGJdbJXFiYmVpuKIncDVHL4QQ_ruHaILaqXnf63vpjLVYRoMAd4nB81R5SKNOO4ZiglFC6_wVLL3JwLU68XARUHnhTQcoqGVQJgMnAwV_5GSMj0HJhcHAcU_y7d7AYVUzOJP-ddyk3ydZGf0n66uldPqCPxWYYc-hJ2fTj_OqVqg3Tplo0mq5odhphZVfkpWiSjn5Go2GyBnGhyXl3NE1UI-moW7g5QkSoF5m">live editor</a>]
 
 ```
   journey
@@ -244,7 +244,7 @@ pie
       Sit down: 3: Me
 ```
 
-### C4 图 [<a href="https://mermaid.js.org/syntax/c4.html">文档</a>]
+### C4 图 [<a href="https://mermaid-js.github.io/mermaid/#/c4c">文档</a>]
 
 ```
 C4Context
@@ -338,7 +338,7 @@ npm publish
 
 Mermaid 是一个不断发展中的社区，并且还在接收新的贡献者。有很多不同的方式可以参与进来，而且我们还在寻找额外的帮助。如果你想知道如何开始贡献，请查看 [这个 issue](https://github.com/mermaid-js/mermaid/issues/866)。
 
-关于如何贡献的详细信息可以在 [贡献指南](https://mermaid.js.org/community/contributing.html) 中找到。
+关于如何贡献的详细信息可以在 [贡献指南](CONTRIBUTING.md) 中找到。
 
 ## 安全
 

__mocks__/c4Renderer.js

@@ -0,0 +1,21 @@
+/**
+ * Mocked C4Context diagram renderer
+ */
+
+import { vi } from 'vitest';
+
+export const drawPersonOrSystemArray = vi.fn();
+export const drawBoundary = vi.fn();
+
+export const setConf = vi.fn();
+
+export const draw = vi.fn().mockImplementation(() => {
+  return '';
+});
+
+export default {
+  drawPersonOrSystemArray,
+  drawBoundary,
+  setConf,
+  draw,
+};

__mocks__/classRenderer-v2.js

@@ -0,0 +1,16 @@
+/**
+ * Mocked class diagram v2 renderer
+ */
+
+import { vi } from 'vitest';
+
+export const setConf = vi.fn();
+
+export const draw = vi.fn().mockImplementation(() => {
+  return '';
+});
+
+export default {
+  setConf,
+  draw,
+};

__mocks__/classRenderer.js

@@ -0,0 +1,13 @@
+/**
+ * Mocked class diagram renderer
+ */
+
+import { vi } from 'vitest';
+
+export const draw = vi.fn().mockImplementation(() => {
+  return '';
+});
+
+export default {
+  draw,
+};

__mocks__/dagre-d3.ts

@@ -0,0 +1 @@
+// DO NOT delete this file. It is used by vitest to mock the dagre-d3 module.

__mocks__/entity-decode/browser.ts

@@ -0,0 +1,3 @@
+module.exports = function (txt: string) {
+  return txt;
+};

__mocks__/erRenderer.js

@@ -0,0 +1,16 @@
+/**
+ * Mocked er diagram renderer
+ */
+
+import { vi } from 'vitest';
+
+export const setConf = vi.fn();
+
+export const draw = vi.fn().mockImplementation(() => {
+  return '';
+});
+
+export default {
+  setConf,
+  draw,
+};

__mocks__/flowRenderer-v2.js

@@ -0,0 +1,24 @@
+/**
+ * Mocked flow (flowchart) diagram v2 renderer
+ */
+
+import { vi } from 'vitest';
+
+export const setConf = vi.fn();
+export const addVertices = vi.fn();
+export const addEdges = vi.fn();
+export const getClasses = vi.fn().mockImplementation(() => {
+  return {};
+});
+
+export const draw = vi.fn().mockImplementation(() => {
+  return '';
+});
+
+export default {
+  setConf,
+  addVertices,
+  addEdges,
+  getClasses,
+  draw,
+};

__mocks__/ganttRenderer.js

@@ -0,0 +1,16 @@
+/**
+ * Mocked gantt diagram renderer
+ */
+
+import { vi } from 'vitest';
+
+export const setConf = vi.fn();
+
+export const draw = vi.fn().mockImplementation(() => {
+  return '';
+});
+
+export default {
+  setConf,
+  draw,
+};

__mocks__/gitGraphRenderer.js

@@ -0,0 +1,13 @@
+/**
+ * Mocked git (graph) diagram renderer
+ */
+
+import { vi } from 'vitest';
+
+export const draw = vi.fn().mockImplementation(() => {
+  return '';
+});
+
+export default {
+  draw,
+};

__mocks__/journeyRenderer.js

@@ -0,0 +1,15 @@
+/**
+ * Mocked pie (picChart) diagram renderer
+ */
+
+import { vi } from 'vitest';
+export const setConf = vi.fn();
+
+export const draw = vi.fn().mockImplementation(() => {
+  return '';
+});
+
+export default {
+  setConf,
+  draw,
+};

__mocks__/pieRenderer.ts

@@ -0,0 +1,8 @@
+/**
+ * Mocked pie (picChart) diagram renderer
+ */
+import { vi } from 'vitest';
+
+const draw = vi.fn().mockImplementation(() => '');
+
+export const renderer = { draw };

__mocks__/requirementRenderer.js

@@ -0,0 +1,13 @@
+/**
+ * Mocked requirement diagram renderer
+ */
+
+import { vi } from 'vitest';
+
+export const draw = vi.fn().mockImplementation(() => {
+  return '';
+});
+
+export default {
+  draw,
+};

__mocks__/sankeyRenderer.js

@@ -0,0 +1,13 @@
+/**
+ * Mocked Sankey diagram renderer
+ */
+
+import { vi } from 'vitest';
+
+export const draw = vi.fn().mockImplementation(() => {
+  return '';
+});
+
+export default {
+  draw,
+};

__mocks__/sequenceRenderer.js

@@ -0,0 +1,23 @@
+/**
+ * Mocked sequence diagram renderer
+ */
+
+import { vi } from 'vitest';
+
+export const bounds = vi.fn();
+export const drawActors = vi.fn();
+export const drawActorsPopup = vi.fn();
+
+export const setConf = vi.fn();
+
+export const draw = vi.fn().mockImplementation(() => {
+  return '';
+});
+
+export default {
+  bounds,
+  drawActors,
+  drawActorsPopup,
+  setConf,
+  draw,
+};

__mocks__/stateRenderer-v2.js

@@ -0,0 +1,22 @@
+/**
+ * Mocked state diagram v2 renderer
+ */
+
+import { vi } from 'vitest';
+
+export const setConf = vi.fn();
+export const getClasses = vi.fn().mockImplementation(() => {
+  return {};
+});
+export const stateDomId = vi.fn().mockImplementation(() => {
+  return 'mocked-stateDiagram-stateDomId';
+});
+export const draw = vi.fn().mockImplementation(() => {
+  return '';
+});
+
+export default {
+  setConf,
+  getClasses,
+  draw,
+};

applitools.config.js

@@ -0,0 +1,19 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { defineConfig } = require('cypress');
+
+module.exports = defineConfig({
+  testConcurrency: 1,
+  browser: [
+    // Add browsers with different viewports
+    //   { width: 800, height: 600, name: 'chrome' },
+    //   { width: 700, height: 500, name: 'firefox' },
+    //   { width: 1600, height: 1200, name: 'ie11' },
+    //   { width: 1024, height: 768, name: 'edgechromium' },
+    //   { width: 800, height: 600, name: 'safari' },
+    //   // Add mobile emulation devices in Portrait mode
+    //   { deviceName: 'iPhone X', screenOrientation: 'portrait' },
+    //   { deviceName: 'Pixel 2', screenOrientation: 'portrait' },
+  ],
+  // set batch name to the configuration
+  // batchName: `Mermaid ${process.env.APPLI_BRANCH ?? "'no APPLI_BRANCH set'"}`,
+});

cSpell.json

@@ -0,0 +1,210 @@
+{
+  "version": "0.2",
+  "language": "en",
+  "words": [
+    "acyclicer",
+    "adamiecki",
+    "alois",
+    "aloisklink",
+    "antiscript",
+    "antlr",
+    "appli",
+    "applitools",
+    "asciidoctor",
+    "ashish",
+    "ashishjain",
+    "astah",
+    "bbox",
+    "bilkent",
+    "bisheng",
+    "blrs",
+    "braintree",
+    "brkt",
+    "brolin",
+    "brotli",
+    "catmull",
+    "città",
+    "classdef",
+    "codedoc",
+    "colour",
+    "commitlint",
+    "cpettitt",
+    "customizability",
+    "cuzon",
+    "cytoscape",
+    "dagre",
+    "deepdwn",
+    "descr",
+    "docsify",
+    "docsy",
+    "doku",
+    "dompurify",
+    "dont",
+    "doublecircle",
+    "edgechromium",
+    "elems",
+    "elkjs",
+    "elle",
+    "faber",
+    "flatmap",
+    "foswiki",
+    "frontmatter",
+    "ftplugin",
+    "gantt",
+    "gitea",
+    "gitgraph",
+    "globby",
+    "graphlib",
+    "graphviz",
+    "grav",
+    "greywolf",
+    "gzipped",
+    "huynh",
+    "huynhicode",
+    "iife",
+    "inkdrop",
+    "jaoude",
+    "jgreywolf",
+    "jison",
+    "jiti",
+    "kaufmann",
+    "khroma",
+    "klemm",
+    "klink",
+    "knsv",
+    "knut",
+    "knutsveidqvist",
+    "laganeckas",
+    "langium",
+    "linetype",
+    "lintstagedrc",
+    "logmsg",
+    "lucida",
+    "markdownish",
+    "matthieu",
+    "matthieumorel",
+    "mdast",
+    "mdbook",
+    "mermaidjs",
+    "mermerd",
+    "metafile",
+    "mindaugas",
+    "mindmap",
+    "mindmaps",
+    "mitigations",
+    "mkdocs",
+    "mmorel",
+    "mult",
+    "neurodiverse",
+    "nextra",
+    "nikolay",
+    "nirname",
+    "npmjs",
+    "orlandoni",
+    "outdir",
+    "pathe",
+    "pbrolin",
+    "phpbb",
+    "plantuml",
+    "playfair",
+    "pnpm",
+    "podlite",
+    "quence",
+    "radious",
+    "ranksep",
+    "rect",
+    "rects",
+    "reda",
+    "redmine",
+    "regexes",
+    "rehype",
+    "roledescription",
+    "rozhkov",
+    "sandboxed",
+    "sankey",
+    "setupgraphviewbox",
+    "shiki",
+    "sidharth",
+    "sidharthv",
+    "sphinxcontrib",
+    "startx",
+    "starty",
+    "statediagram",
+    "steph",
+    "stopx",
+    "stopy",
+    "stylis",
+    "subhash-halder",
+    "substate",
+    "sulais",
+    "sveidqvist",
+    "swimm",
+    "techn",
+    "teststr",
+    "textlength",
+    "treemap",
+    "ts-nocheck",
+    "tsdoc",
+    "tuleap",
+    "tylerlong",
+    "typora",
+    "ugge",
+    "unist",
+    "unocss",
+    "upvoting",
+    "valign",
+    "verdana",
+    "viewports",
+    "vinod",
+    "visio",
+    "vitepress",
+    "vueuse",
+    "xlink",
+    "xychart",
+    "yash",
+    "yokozuna",
+    "zenuml",
+    "zune"
+  ],
+  "patterns": [
+    { "name": "Markdown links", "pattern": "\\((.*)\\)", "description": "" },
+    {
+      "name": "Markdown code blocks",
+      "pattern": "/^(\\s*`{3,}).*[\\s\\S]*?^\\1/gmx",
+      "description": "Taken from the cSpell example at https://cspell.org/configuration/patterns/#verbose-regular-expressions"
+    },
+    {
+      "name": "Inline code blocks",
+      "pattern": "\\`([^\\`\\r\\n]+?)\\`",
+      "description": "https://stackoverflow.com/questions/41274241/how-to-capture-inline-markdown-code-but-not-a-markdown-code-fence-with-regex"
+    },
+    { "name": "Link contents", "pattern": "\\<a(.*)\\>", "description": "" },
+    { "name": "Snippet references", "pattern": "-- snippet:(.*)", "description": "" },
+    {
+      "name": "Snippet references 2",
+      "pattern": "\\<\\[sample:(.*)",
+      "description": "another kind of snippet reference"
+    },
+    { "name": "Multi-line code blocks", "pattern": "/^\\s*```[\\s\\S]*?^\\s*```/gm" },
+    {
+      "name": "HTML Tags",
+      "pattern": "<[^>]*>",
+      "description": "Reference: https://stackoverflow.com/questions/11229831/regular-expression-to-remove-html-tags-from-a-string"
+    }
+  ],
+  "ignoreRegExpList": [
+    "Markdown links",
+    "Markdown code blocks",
+    "Inline code blocks",
+    "Link contents",
+    "Snippet references",
+    "Snippet references 2",
+    "Multi-line code blocks",
+    "HTML Tags"
+  ],
+  "ignorePaths": [
+    "packages/mermaid/src/docs/CHANGELOG.md",
+    "packages/mermaid/src/docs/.vitepress/redirect.ts",
+    "packages/mermaid/src/docs/.vitepress/contributor-names.json"
+  ]
+}

cspell.config.yaml

@@ -1,45 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json
-
-$schema: https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json
-version: '0.2'
-language: en-US,en-GB
-
-import:
-  - ./.cspell/cspell.config.yaml
-
-ignoreRegExpList:
-  - character-set-cyrillic
-  - svg-block
-ignorePaths:
-  - '*lock.{yaml,json}'
-  - dist
-  - CHANGELOG.md
-  - packages/mermaid/src/docs/.vitepress/redirect.ts
-  - packages/mermaid/src/docs/.vitepress/contributor-names.json
-  - backup
-  - '**/*.spec.{js,ts}' # checked by eslint
-  - 'tests/webpack/src/index.js' # checked by eslint
-  - 'cypress/**/*.js' # checked by eslint
-  - '*.csv'
-  - '*.patch'
-  - 'docs/**/*.html'
-  - 'cypress/platform/**'
-dictionaries:
-  - misc-terms
-overrides:
-  - filename:
-      - '**/*.{jison,ts,mts,cjs,mjs,js,json,yaml,yml,md,html}'
-      - 'run'
-      - Dockerfile
-    ignoreRegExpList:
-      - js-unicode-escape
-    dictionaries:
-      - code-terms
-      - 3rd-party-terms
-      - fonts
-      - html
-      - lorem-ipsum
-  - filename: '**/package.json'
-    ignoreRegExpList:
-      - json-property
-# cspell:dictionaries code-terms

cypress.config.cjs

@@ -0,0 +1,24 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+
+const { defineConfig } = require('cypress');
+const { addMatchImageSnapshotPlugin } = require('cypress-image-snapshot/plugin');
+const coverage = require('@cypress/code-coverage/task');
+
+module.exports = defineConfig({
+  projectId: 'n2sma2',
+  e2e: {
+    specPattern: 'cypress/integration/**/*.{js,jsx,ts,tsx}',
+    setupNodeEvents(on, config) {
+      coverage(on, config);
+      addMatchImageSnapshotPlugin(on, config);
+      // copy any needed variables from process.env to config.env
+      config.env.useAppli = process.env.USE_APPLI ? true : false;
+
+      // do not forget to return the changed config object!
+      return config;
+    },
+  },
+  video: false,
+});
+
+require('@applitools/eyes-cypress')(module);

cypress.config.ts

@@ -1,30 +0,0 @@
-import { defineConfig } from 'cypress';
-import { addMatchImageSnapshotPlugin } from 'cypress-image-snapshot/plugin';
-import coverage from '@cypress/code-coverage/task';
-import eyesPlugin from '@applitools/eyes-cypress';
-export default eyesPlugin(
-  defineConfig({
-    projectId: 'n2sma2',
-    viewportWidth: 1440,
-    viewportHeight: 1024,
-    e2e: {
-      specPattern: 'cypress/integration/**/*.{js,ts}',
-      setupNodeEvents(on, config) {
-        coverage(on, config);
-        on('before:browser:launch', (browser, launchOptions) => {
-          if (browser.name === 'chrome' && browser.isHeadless) {
-            launchOptions.args.push('--window-size=1440,1024', '--force-device-scale-factor=1');
-          }
-          return launchOptions;
-        });
-        addMatchImageSnapshotPlugin(on, config);
-        // copy any needed variables from process.env to config.env
-        config.env.useAppli = process.env.USE_APPLI ? true : false;
-
-        // do not forget to return the changed config object!
-        return config;
-      },
-    },
-    video: false,
-  })
-);

cypress/helpers/util.ts

@@ -10,7 +10,7 @@ interface CypressConfig {
 type CypressMermaidConfig = MermaidConfig & CypressConfig;
 
 interface CodeObject {
-  code: string | string[];
+  code: string;
   mermaid: CypressMermaidConfig;
 }
 
@@ -25,7 +25,7 @@ const batchId: string =
     : Cypress.env('CYPRESS_COMMIT') || Date.now().toString());
 
 export const mermaidUrl = (
-  graphStr: string | string[],
+  graphStr: string,
   options: CypressMermaidConfig,
   api: boolean
 ): string => {
@@ -82,7 +82,7 @@ export const urlSnapshotTest = (
 };
 
 export const renderGraph = (
-  graphStr: string | string[],
+  graphStr: string,
   options: CypressMermaidConfig = {},
   api = false
 ): void => {

cypress/integration/other/configuration.spec.js

@@ -117,6 +117,7 @@ describe('Configuration', () => {
     });
     it('should not taint the initial configuration when using multiple directives', () => {
       const url = 'http://localhost:9000/regression/issue-1874.html';
+      cy.viewport(1440, 1024);
       cy.visit(url);
 
       cy.get('svg');

cypress/integration/other/flowchart-elk.spec.js

@@ -1,14 +0,0 @@
-import { urlSnapshotTest, openURLAndVerifyRendering } from '../../helpers/util.ts';
-
-describe('Flowchart elk', () => {
-  it('should use dagre as fallback', () => {
-    urlSnapshotTest('http://localhost:9000/flow-elk.html', {
-      name: 'flow-elk fallback to dagre',
-    });
-  });
-  it('should allow overriding with external package', () => {
-    urlSnapshotTest('http://localhost:9000/flow-elk.html?elk=true', {
-      name: 'flow-elk overriding dagre with elk',
-    });
-  });
-});

cypress/integration/other/rerender.spec.js

@@ -1,12 +1,14 @@
 describe('Rerendering', () => {
   it('should be able to render after an error has occurred', () => {
     const url = 'http://localhost:9000/render-after-error.html';
+    cy.viewport(1440, 1024);
     cy.visit(url);
     cy.get('#graphDiv').should('exist');
   });
 
   it('should be able to render and rerender a graph via API', () => {
     const url = 'http://localhost:9000/rerender.html';
+    cy.viewport(1440, 1024);
     cy.visit(url);
     cy.get('#graph [id^=flowchart-A]').should('have.text', 'XMas');
 

cypress/integration/rendering/block.spec.js

@@ -1,386 +0,0 @@
-import { imgSnapshotTest } from '../../helpers/util';
-/* eslint-disable no-useless-escape */
-describe('Block diagram', () => {
-  it('BL1: should calculate the block widths', () => {
-    imgSnapshotTest(
-      `block-beta
-  columns 2
-  block
-    id2["I am a wide one"]
-    id1
-  end
-  id["Next row"]
-      `
-    );
-  });
-
-  it('BL2: should handle colums statement in sub-blocks', () => {
-    imgSnapshotTest(
-      `block-beta
-  id1["Hello"]
-  block
-    columns 3
-    id2["to"]
-    id3["the"]
-    id4["World"]
-    id5["World"]
-  end
-      `,
-      {}
-    );
-  });
-
-  it('BL3: should align block widths and handle colums statement in sub-blocks', () => {
-    imgSnapshotTest(
-      `block-beta
-  block
-    columns 1
-    id1
-    id2
-    id2.1
-  end
-  id3
-  id4
-      `,
-      {}
-    );
-  });
-
-  it('BL4: should align block widths and handle colums statements in deeper sub-blocks then 1 level', () => {
-    imgSnapshotTest(
-      `block-beta
-  columns 1
-  block
-    columns 1
-    block
-      columns 3
-      id1
-      id2
-      id2.1(("XYZ"))
-    end
-    id48
-  end
-  id3
-      `,
-      {}
-    );
-  });
-
-  it('BL5: should align block widths and handle colums statements in deeper sub-blocks then 1 level (alt)', () => {
-    imgSnapshotTest(
-      `block-beta
-  columns 1
-  block
-    id1
-    id2
-    block
-      columns 1
-      id3("Wider then")
-      id5(("id5"))
-    end
-  end
-  id4
-      `,
-      {}
-    );
-  });
-
-  it('BL6: should handle block arrows and spece statements', () => {
-    imgSnapshotTest(
-      `block-beta
-    columns 3
-    space:3
-    ida idb idc
-    id1  id2
-      blockArrowId<["Label"]>(right)
-      blockArrowId2<["Label"]>(left)
-      blockArrowId3<["Label"]>(up)
-      blockArrowId4<["Label"]>(down)
-      blockArrowId5<["Label"]>(x)
-      blockArrowId6<["Label"]>(y)
-      blockArrowId6<["Label"]>(x, down)
-      `,
-      {}
-    );
-  });
-
-  it('BL7: should handle different types of edges', () => {
-    imgSnapshotTest(
-      `block-beta
-      columns 3
-      A space:5
-      A --o B
-      A --> C
-      A --x D
-      `,
-      {}
-    );
-  });
-
-  it('BL8: should handle sub-blocks without columns statements', () => {
-    imgSnapshotTest(
-      `block-beta
-      columns 2
-      C A B
-      block
-        D
-        E
-      end
-      `,
-      {}
-    );
-  });
-
-  it('BL9: should handle edges from blocks in sub blocks to other blocks', () => {
-    imgSnapshotTest(
-      `block-beta
-      columns 3
-      B space
-      block
-        D
-      end
-      D --> B
-      `,
-      {}
-    );
-  });
-
-  it('BL10: should handle edges from composite blocks', () => {
-    imgSnapshotTest(
-      `block-beta
-      columns 3
-      B space
-      block BL
-        D
-      end
-      BL --> B
-      `,
-      {}
-    );
-  });
-
-  it('BL11: should handle edges to composite blocks', () => {
-    imgSnapshotTest(
-      `block-beta
-      columns 3
-      B space
-      block BL
-        D
-      end
-      B --> BL
-      `,
-      {}
-    );
-  });
-
-  it('BL12: edges should handle labels', () => {
-    imgSnapshotTest(
-      `block-beta
-      A
-      space
-      A -- "apa" --> E
-      `,
-      {}
-    );
-  });
-
-  it('BL13: should handle block arrows in different directions', () => {
-    imgSnapshotTest(
-      `block-beta
-      columns 3
-      space blockArrowId1<["down"]>(down) space
-      blockArrowId2<["right"]>(right) blockArrowId3<["Sync"]>(x, y) blockArrowId4<["left"]>(left)
-      space blockArrowId5<["up"]>(up) space
-      blockArrowId6<["x"]>(x) space blockArrowId7<["y"]>(y)
-      `,
-      {}
-    );
-  });
-
-  it('BL14: should style statements and class statements', () => {
-    imgSnapshotTest(
-      `block-beta
-    A
-    B
-    classDef blue fill:#66f,stroke:#333,stroke-width:2px;
-    class A blue
-    style B fill:#f9F,stroke:#333,stroke-width:4px
-      `,
-      {}
-    );
-  });
-
-  it('BL15: width alignment - D and E should share available space', () => {
-    imgSnapshotTest(
-      `block-beta
-  block
-    D
-    E
-  end
-  db("This is the text in the box")
-      `,
-      {}
-    );
-  });
-
-  it('BL16: width alignment - C should be as wide as the composite block', () => {
-    imgSnapshotTest(
-      `block-beta
-  block
-    A("This is the text")
-    B
-  end
-  C
-      `,
-      {}
-    );
-  });
-
-  it('BL16: width alignment - blocks shold be equal in width', () => {
-    imgSnapshotTest(
-      `block-beta
-    A("This is the text")
-    B
-    C
-      `,
-      {}
-    );
-  });
-
-  it('BL17: block types 1 - square, rounded and circle', () => {
-    imgSnapshotTest(
-      `block-beta
-    A["square"]
-    B("rounded")
-    C(("circle"))
-      `,
-      {}
-    );
-  });
-
-  it('BL18: block types 2 - odd, diamond and hexagon', () => {
-    imgSnapshotTest(
-      `block-beta
-    A>"rect_left_inv_arrow"]
-    B{"diamond"}
-    C{{"hexagon"}}
-      `,
-      {}
-    );
-  });
-
-  it('BL19: block types 3 - stadium', () => {
-    imgSnapshotTest(
-      `block-beta
-    A(["stadium"])
-      `,
-      {}
-    );
-  });
-
-  it('BL20: block types 4 - lean right, lean left, trapezoid and inv trapezoid', () => {
-    imgSnapshotTest(
-      `block-beta
-    A[/"lean right"/]
-    B[\"lean left"\]
-    C[/"trapezoid"\]
-    D[\"trapezoid alt"/]
-      `,
-      {}
-    );
-  });
-
-  it('BL21: block types 1 - square, rounded and circle', () => {
-    imgSnapshotTest(
-      `block-beta
-    A["square"]
-    B("rounded")
-    C(("circle"))
-      `,
-      {}
-    );
-  });
-
-  it('BL22: sizing - it should be possible to make a block wider', () => {
-    imgSnapshotTest(
-      `block-beta
-      A("rounded"):2
-      B:2
-      C
-      `,
-      {}
-    );
-  });
-
-  it('BL23: sizing - it should be possible to make a composite block wider', () => {
-    imgSnapshotTest(
-      `block-beta
-      block:2
-        A
-      end
-      B
-      `,
-      {}
-    );
-  });
-
-  it('BL24: block in the middle with space on each side', () => {
-    imgSnapshotTest(
-      `block-beta
-        columns 3
-        space
-        middle["In the middle"]
-        space
-      `,
-      {}
-    );
-  });
-  it('BL25: space and an edge', () => {
-    imgSnapshotTest(
-      `block-beta
-  columns 5
-    A space B
-    A --x B
-      `,
-      {}
-    );
-  });
-  it('BL26: block sizes for regular blocks', () => {
-    imgSnapshotTest(
-      `block-beta
-  columns 3
-    a["A wide one"] b:2 c:2 d
-      `,
-      {}
-    );
-  });
-  it('BL27: composite block with a set width - f should use the available space', () => {
-    imgSnapshotTest(
-      `block-beta
-  columns 3
-  a:3
-  block:e:3
-      f
-  end
-  g
-      `,
-      {}
-    );
-  });
-  it('BL23: composite block with a set width - f and g should split the available space', () => {
-    imgSnapshotTest(
-      `block-beta
-  columns 3
-  a:3
-  block:e:3
-      f
-      g
-  end
-  h
-  i
-  j
-      `,
-      {}
-    );
-  });
-});

cypress/integration/rendering/classDiagram-v2.spec.js

@@ -571,14 +571,4 @@ class C13["With Città foreign language"]
       { logLevel: 1, flowchart: { htmlLabels: false } }
     );
   });
-  it('should render a simple class diagram with style definition', () => {
-    imgSnapshotTest(
-      `
-      classDiagram-v2
-        class Class10
-        style Class10 fill:#f9f,stroke:#333,stroke-width:4px
-        `,
-      { logLevel: 1, flowchart: { htmlLabels: false } }
-    );
-  });
 });

cypress/integration/rendering/debug.spec.js

@@ -0,0 +1,12 @@
+import { imgSnapshotTest } from '../../helpers/util.ts';
+
+describe('Flowchart', () => {
+  it('34: testing the label width in percy', () => {
+    imgSnapshotTest(
+      `graph TD
+      A[Christmas]
+      `,
+      { theme: 'forest', fontFamily: '"Noto Sans SC", sans-serif' }
+    );
+  });
+});

cypress/integration/rendering/flowchart-v2.spec.js

@@ -729,37 +729,6 @@ A ~~~ B
       {}
     );
   });
-
-  it('5064: Should render when subgraph child has links to outside node and subgraph', () => {
-    imgSnapshotTest(
-      `flowchart TB
-    Out --> In
-    subgraph Sub
-      In
-    end
-    Sub --> In`
-    );
-  });
-
-  it('5059: Should render when subgraph contains only subgraphs, has link to outside and itself is part of a link', () => {
-    imgSnapshotTest(
-      `flowchart
-
-      subgraph Main
-        subgraph Child1
-          Node1
-          Node2
-        end
-        subgraph Child2
-          Node3
-          Node4
-        end
-      end
-      Main --> Out1
-      Child2 --> Out2`
-    );
-  });
-
   describe('Markdown strings flowchart (#4220)', () => {
     describe('html labels', () => {
       it('With styling and classes', () => {
@@ -905,93 +874,4 @@ end
       });
     });
   });
-  describe('Subgraph title margins', () => {
-    it('Should render subgraphs with title margins set (LR)', () => {
-      imgSnapshotTest(
-        `flowchart LR
-
-          subgraph TOP
-              direction TB
-              subgraph B1
-                  direction RL
-                  i1 -->f1
-              end
-              subgraph B2
-                  direction BT
-                  i2 -->f2
-              end
-          end
-          A --> TOP --> B
-          B1 --> B2
-        `,
-        { flowchart: { subGraphTitleMargin: { top: 10, bottom: 5 } } }
-      );
-    });
-    it('Should render subgraphs with title margins set (TD)', () => {
-      imgSnapshotTest(
-        `flowchart TD
-
-          subgraph TOP
-              direction LR
-              subgraph B1
-                  direction RL
-                  i1 -->f1
-              end
-              subgraph B2
-                  direction BT
-                  i2 -->f2
-              end
-          end
-          A --> TOP --> B
-          B1 --> B2
-        `,
-        { flowchart: { subGraphTitleMargin: { top: 8, bottom: 16 } } }
-      );
-    });
-    it('Should render subgraphs with title margins set (LR) and htmlLabels set to false', () => {
-      imgSnapshotTest(
-        `flowchart LR
-
-          subgraph TOP
-              direction TB
-              subgraph B1
-                  direction RL
-                  i1 -->f1
-              end
-              subgraph B2
-                  direction BT
-                  i2 -->f2
-              end
-          end
-          A --> TOP --> B
-          B1 --> B2
-        `,
-        {
-          htmlLabels: false,
-          flowchart: { htmlLabels: false, subGraphTitleMargin: { top: 10, bottom: 5 } },
-        }
-      );
-    });
-    it('Should render subgraphs with title margins and edge labels', () => {
-      imgSnapshotTest(
-        `flowchart LR
-
-          subgraph TOP
-              direction TB
-              subgraph B1
-                  direction RL
-                  i1 --lb1-->f1
-              end
-              subgraph B2
-                  direction BT
-                  i2 --lb2-->f2
-              end
-          end
-          A --lb3--> TOP --lb4--> B
-          B1 --lb5--> B2
-        `,
-        { flowchart: { subGraphTitleMargin: { top: 10, bottom: 5 } } }
-      );
-    });
-  });
 });

cypress/integration/rendering/gantt.spec.js

@@ -92,31 +92,6 @@ describe('Gantt diagram', () => {
       {}
     );
   });
-  it('should handle multiple dependencies syntax with after and until', () => {
-    imgSnapshotTest(
-      `
-      gantt
-      dateFormat  YYYY-MM-DD
-      axisFormat  %d/%m
-      title Adding GANTT diagram to mermaid
-      excludes weekdays 2014-01-10
-      todayMarker off
-  
-      section team's critical event
-      deadline A           :milestone, crit, deadlineA, 2024-02-01, 0
-      deadline B           :milestone, crit, deadlineB, 2024-02-15, 0
-      boss on leave        :bossaway, 2024-01-28, 2024-02-11
-  
-      section new intern
-      onboarding           :onboarding, 2024-01-02, 1w
-      literature review    :litreview, 2024-01-02, 10d
-      project A            :projectA, after onboarding litreview, until deadlineA bossaway
-      chilling             :chilling, after projectA, until deadlineA
-      project B            :projectB, after deadlineA, until deadlineB
-      `,
-      {}
-    );
-  });
   it('should FAIL redering a gantt chart for issue #1060 with invalid date', () => {
     imgSnapshotTest(
       `
@@ -270,10 +245,7 @@ describe('Gantt diagram', () => {
       const style = svg.attr('style');
       expect(style).to.match(/^max-width: [\d.]+px;$/);
       const maxWidthValue = parseFloat(style.match(/[\d.]+/g).join(''));
-      expect(maxWidthValue).to.be.within(
-        Cypress.config().viewportWidth * 0.95,
-        Cypress.config().viewportWidth * 1.05
-      );
+      expect(maxWidthValue).to.be.within(984 * 0.95, 984 * 1.05);
     });
   });
 
@@ -313,11 +285,11 @@ describe('Gantt diagram', () => {
       { gantt: { useMaxWidth: false } }
     );
     cy.get('svg').should((svg) => {
+      // const height = parseFloat(svg.attr('height'));
       const width = parseFloat(svg.attr('width'));
-      expect(width).to.be.within(
-        Cypress.config().viewportWidth * 0.95,
-        Cypress.config().viewportWidth * 1.05
-      );
+      // use within because the absolute value can be slightly different depending on the environment ±5%
+      // expect(height).to.be.within(484 * 0.95, 484 * 1.05);
+      expect(width).to.be.within(984 * 0.95, 984 * 1.05);
       expect(svg).to.not.have.attr('style');
     });
   });
@@ -608,106 +580,4 @@ describe('Gantt diagram', () => {
       {}
     );
   });
-
-  it("should render when there's a semicolon in the title", () => {
-    imgSnapshotTest(
-      `
-      gantt
-      title ;Gantt With a Semicolon in the Title
-      dateFormat  YYYY-MM-DD
-      section Section
-      A task           :a1, 2014-01-01, 30d
-      Another task     :after a1  , 20d
-      section Another
-      Task in sec      :2014-01-12  , 12d
-      another task      : 24d
-    `,
-      {}
-    );
-  });
-
-  it("should render when there's a semicolon in a section is true", () => {
-    imgSnapshotTest(
-      `
-      gantt
-      title Gantt Digram
-      dateFormat  YYYY-MM-DD
-      section ;Section With a Semicolon
-      A task           :a1, 2014-01-01, 30d
-      Another task     :after a1  , 20d
-      section Another
-      Task in sec      :2014-01-12  , 12d
-      another task      : 24d
-    `,
-      {}
-    );
-  });
-
-  it("should render when there's a semicolon in the task data", () => {
-    imgSnapshotTest(
-      `
-      gantt
-      title Gantt Digram
-      dateFormat  YYYY-MM-DD
-      section Section
-      ;A task with a semiclon           :a1, 2014-01-01, 30d
-      Another task     :after a1  , 20d
-      section Another
-      Task in sec      :2014-01-12  , 12d
-      another task      : 24d
-    `,
-      {}
-    );
-  });
-
-  it("should render when there's a hashtag in the title", () => {
-    imgSnapshotTest(
-      `
-      gantt
-      title #Gantt With a Hashtag in the Title
-      dateFormat  YYYY-MM-DD
-      section Section
-      A task           :a1, 2014-01-01, 30d
-      Another task     :after a1  , 20d
-      section Another
-      Task in sec      :2014-01-12  , 12d
-      another task      : 24d
-    `,
-      {}
-    );
-  });
-
-  it("should render when there's a hashtag in a section is true", () => {
-    imgSnapshotTest(
-      `
-      gantt
-      title Gantt Digram
-      dateFormat  YYYY-MM-DD
-      section #Section With a Hashtag
-      A task           :a1, 2014-01-01, 30d
-      Another task     :after a1  , 20d
-      section Another
-      Task in sec      :2014-01-12  , 12d
-      another task      : 24d
-    `,
-      {}
-    );
-  });
-
-  it("should render when there's a hashtag in the task data", () => {
-    imgSnapshotTest(
-      `
-      gantt
-      title Gantt Digram
-      dateFormat  YYYY-MM-DD
-      section Section
-      #A task with a hashtag           :a1, 2014-01-01, 30d
-      Another task     :after a1  , 20d
-      section Another
-      Task in sec      :2014-01-12  , 12d
-      another task      : 24d
-    `,
-      {}
-    );
-  });
 });

cypress/integration/rendering/gitGraph.spec.js

@@ -701,316 +701,4 @@ gitGraph TB:
       {}
     );
   });
-  it('34: should render a simple gitgraph with two branches from same commit', () => {
-    imgSnapshotTest(
-      `gitGraph
-      commit id:"1-abcdefg"
-      commit id:"2-abcdefg"
-      branch feature-001
-      commit id:"3-abcdefg"
-      commit id:"4-abcdefg"
-      checkout main
-      branch feature-002
-      commit id:"5-abcdefg"
-      checkout feature-001
-      merge feature-002
-      `,
-      {}
-    );
-  });
-  it('35: should render a simple gitgraph with two branches from same commit | Vertical Branch', () => {
-    imgSnapshotTest(
-      `gitGraph TB:
-      commit id:"1-abcdefg"
-      commit id:"2-abcdefg"
-      branch feature-001
-      commit id:"3-abcdefg"
-      commit id:"4-abcdefg"
-      checkout main
-      branch feature-002
-      commit id:"5-abcdefg"
-      checkout feature-001
-      merge feature-002
-      `,
-      {}
-    );
-  });
-  it('36: should render GitGraph with branch that is not used immediately', () => {
-    imgSnapshotTest(
-      `gitGraph LR:
-      commit id:"1-abcdefg"
-      branch x
-      checkout main
-      commit id:"2-abcdefg"
-      checkout x
-      commit id:"3-abcdefg"
-      checkout main
-      merge x
-      `,
-      {}
-    );
-  });
-  it('37: should render GitGraph with branch that is not used immediately | Vertical Branch', () => {
-    imgSnapshotTest(
-      `gitGraph TB:
-      commit id:"1-abcdefg"
-      branch x
-      checkout main
-      commit id:"2-abcdefg"
-      checkout x
-      commit id:"3-abcdefg"
-      checkout main
-      merge x
-      `,
-      {}
-    );
-  });
-  it('38: should render GitGraph with branch and sub-branch neither of which used immediately', () => {
-    imgSnapshotTest(
-      `gitGraph LR:
-      commit id:"1-abcdefg"
-      branch x
-      checkout main
-      commit id:"2-abcdefg"
-      checkout x
-      commit id:"3-abcdefg"
-      checkout main
-      merge x
-      checkout x
-      branch y
-      checkout x
-      commit id:"4-abcdefg"
-      checkout y
-      commit id:"5-abcdefg"
-      checkout x
-      merge y
-      `,
-      {}
-    );
-  });
-  it('39: should render GitGraph with branch and sub-branch neither of which used immediately | Vertical Branch', () => {
-    imgSnapshotTest(
-      `gitGraph TB:
-      commit id:"1-abcdefg"
-      branch x
-      checkout main
-      commit id:"2-abcdefg"
-      checkout x
-      commit id:"3-abcdefg"
-      checkout main
-      merge x
-      checkout x
-      branch y
-      checkout x
-      commit id:"4-abcdefg"
-      checkout y
-      commit id:"5-abcdefg"
-      checkout x
-      merge y
-      `,
-      {}
-    );
-  });
-  it('40: should render a simple gitgraph with cherry pick merge commit', () => {
-    imgSnapshotTest(
-      `gitGraph
-      commit id: "ZERO"
-      branch feature
-      branch release
-      checkout feature
-      commit id: "A"
-      commit id: "B"
-      checkout main
-      merge feature id: "M"
-      checkout release
-      cherry-pick id: "M" parent:"B"`
-    );
-  });
-  it('41: should render default GitGraph with parallelCommits set to false', () => {
-    imgSnapshotTest(
-      `gitGraph
-      commit id:"1-abcdefg"
-      commit id:"2-abcdefg"
-      branch develop
-      commit id:"3-abcdefg"
-      commit id:"4-abcdefg"
-      checkout main
-      branch feature
-      commit id:"5-abcdefg"
-      commit id:"6-abcdefg"
-      checkout main
-      commit id:"7-abcdefg"
-      commit id:"8-abcdefg"
-      `,
-      { gitGraph: { parallelCommits: false } }
-    );
-  });
-  it('42: should render GitGraph with parallel commits', () => {
-    imgSnapshotTest(
-      `gitGraph
-      commit id:"1-abcdefg"
-      commit id:"2-abcdefg"
-      branch develop
-      commit id:"3-abcdefg"
-      commit id:"4-abcdefg"
-      checkout main
-      branch feature
-      commit id:"5-abcdefg"
-      commit id:"6-abcdefg"
-      checkout main
-      commit id:"7-abcdefg"
-      commit id:"8-abcdefg"
-      `,
-      { gitGraph: { parallelCommits: true } }
-    );
-  });
-  it('43: should render GitGraph with parallel commits | Vertical Branch', () => {
-    imgSnapshotTest(
-      `gitGraph TB:
-      commit id:"1-abcdefg"
-      commit id:"2-abcdefg"
-      branch develop
-      commit id:"3-abcdefg"
-      commit id:"4-abcdefg"
-      checkout main
-      branch feature
-      commit id:"5-abcdefg"
-      commit id:"6-abcdefg"
-      checkout main
-      commit id:"7-abcdefg"
-      commit id:"8-abcdefg"
-      `,
-      { gitGraph: { parallelCommits: true } }
-    );
-  });
-  it('44: should render GitGraph with unconnected branches and no parallel commits', () => {
-    imgSnapshotTest(
-      `gitGraph
-      branch dev
-      branch v2
-      branch feat
-      commit id:"1-abcdefg"
-      commit id:"2-abcdefg"
-      checkout main
-      commit id:"3-abcdefg"
-      checkout dev
-      commit id:"4-abcdefg"
-      checkout v2
-      commit id:"5-abcdefg"
-      checkout main
-      commit id:"6-abcdefg"
-      `,
-      { gitGraph: { parallelCommits: false } }
-    );
-  });
-  it('45: should render GitGraph with unconnected branches and parallel commits', () => {
-    imgSnapshotTest(
-      `gitGraph
-      branch dev
-      branch v2
-      branch feat
-      commit id:"1-abcdefg"
-      commit id:"2-abcdefg"
-      checkout main
-      commit id:"3-abcdefg"
-      checkout dev
-      commit id:"4-abcdefg"
-      checkout v2
-      commit id:"5-abcdefg"
-      checkout main
-      commit id:"6-abcdefg"
-      `,
-      { gitGraph: { parallelCommits: true } }
-    );
-  });
-  it('46: should render GitGraph with unconnected branches and parallel commits | Vertical Branch', () => {
-    imgSnapshotTest(
-      `gitGraph TB:
-      branch dev
-      branch v2
-      branch feat
-      commit id:"1-abcdefg"
-      commit id:"2-abcdefg"
-      checkout main
-      commit id:"3-abcdefg"
-      checkout dev
-      commit id:"4-abcdefg"
-      checkout v2
-      commit id:"5-abcdefg"
-      checkout main
-      commit id:"6-abcdefg"
-      `,
-      { gitGraph: { parallelCommits: true } }
-    );
-  });
-  it('46: should render GitGraph with merge back and merge forward', () => {
-    imgSnapshotTest(
-      `gitGraph LR:
-      commit id:"1-abcdefg"
-
-      branch branch-A
-      branch branch-B
-      commit id:"2-abcdefg"
-
-      checkout branch-A
-      merge branch-B
-
-      checkout branch-B
-      merge branch-A
-      `,
-      { gitGraph: { parallelCommits: true } }
-    );
-  });
-  it('47: should render GitGraph with merge back and merge forward | Vertical Branch', () => {
-    imgSnapshotTest(
-      `gitGraph TB:
-      commit id:"1-abcdefg"
-
-      branch branch-A
-      branch branch-B
-      commit id:"2-abcdefg"
-
-      checkout branch-A
-      merge branch-B
-
-      checkout branch-B
-      merge branch-A
-      `,
-      { gitGraph: { parallelCommits: true } }
-    );
-  });
-  it('48: should render GitGraph with merge on a new branch | Vertical Branch', () => {
-    imgSnapshotTest(
-      `gitGraph LR:
-      commit id:"1-abcdefg"
-
-      branch branch-B order: 2
-      commit id:"2-abcdefg"
-
-      branch branch-A
-      merge main
-
-      checkout branch-B
-      merge branch-A
-      `,
-      { gitGraph: { parallelCommits: true } }
-    );
-  });
-  it('49: should render GitGraph with merge on a new branch | Vertical Branch', () => {
-    imgSnapshotTest(
-      `gitGraph TB:
-      commit id:"1-abcdefg"
-
-      branch branch-B order: 2
-      commit id:"2-abcdefg"
-
-      branch branch-A
-      merge main
-
-      checkout branch-B
-      merge branch-A
-      `,
-      { gitGraph: { parallelCommits: true } }
-    );
-  });
 });

cypress/integration/rendering/katex.spec.js

@@ -1,36 +0,0 @@
-import { imgSnapshotTest } from '../../helpers/util';
-
-describe('Katex', () => {
-  it('1: should render a complex Katex flowchart no htmlLabels', () => {
-    imgSnapshotTest(
-      `graph LR
-      A["$$f(\\relax{x}) = \\int_{-\\infty}^\\infty \\hat{f}(\\xi)\\,e^{2 \\pi i \\xi x}\\,d\\xi$$"] -->|"$$\\Bigg(\\bigg(\\Big(\\big((\\frac{-b\\pm\\sqrt{b^2-4ac}}{2a})\\big)\\Big)\\bigg)\\Bigg)$$"| B("$$1+\\frac{e^{-2\\pi}} {1+\\frac{e^{-4\\pi}} {1+\\frac{e^{-6\\pi}} {1+\\frac{e^{-8\\pi}} {1+\\cdots}}}}$$")
-      A -->|"$$\\overbrace{a+b+c}^{\\text{note}}$$"| C("$$\\phase{-78^\\circ}$$")
-      B --> D("$$x = \\begin{cases} a &\\text{if } b \\\\ c &\\text{if } d \\end{cases}$$")
-      C --> E("$$x(t)=c_1\\begin{bmatrix}-\\cos{t}+\\sin{t}\\\\ 2\\cos{t} \\end{bmatrix}e^{2t}$$")`,
-      { fontFamily: 'courier' }
-    );
-  });
-  it('2: should render a Katex flowchart containing the Greek alphabet', () => {
-    imgSnapshotTest(
-      `graph LR
-      A["$$\\alpha\\beta\\gamma\\delta\\epsilon\\zeta\\eta\\theta\\iota\\kappa\\lambda\\mu\\nu\\xi\\omicron\\pi\\rho\\sigma\\tau\\upsilon\\phi\\chi\\psi\\omega$$"] --> B["$$\\Alpha\\Beta\\Gamma\\Delta\\Epsilon\\Zeta\\Eta\\Theta\\Iota\\Kappa\\Lambda\\Mu\\Nu\\Xi\\Omicron\\Pi\\Rho\\Sigma\\Tau\\Upsilon\\Phi\\Chi\\Psi\\Omega$$"]`,
-      { fontFamily: 'courier' }
-    );
-  });
-  it('3: should render a Katex flowchart containing set theory symbols', () => {
-    imgSnapshotTest(
-      `graph LR
-      A["$$\\forall\\complement\\therefore\\emptyset\\exists\\subset\\because\\empty\\exist\\supset\\mapsto\\varnothing\\nexists\\mid\\to\\implies\\in\\land\\gets\\impliedby\\isin\\lor\\leftrightarrow\\iff\\notin\\ni\\notni\\lnot$$"] --> B["$$\\nabla\\Im\\Reals\\jmath\\partial\\image\\wp\\aleph\\Game\\weierp\\alef\\Finv\\N\\Z\\alefsym\\cnums\\natnums\\beth\\Complex\\R\\gimel\\ell\\Re\\daleth\\hbar\\real\\eth\\hslash\\reals$$"]`,
-      { fontFamily: 'courier' }
-    );
-  });
-  // TODO: changes made to develop between Feb 13 - Feb 23 cause this test to no longer function
-  // it.skip('4: should render an error box originating from Katex', () => {
-  //   imgSnapshotTest(
-  //     `graph LR
-  //     A["$$\\shouldBeError$$"]`,
-  //     { fontFamily: 'courier' }
-  //   );
-  // });
-});

cypress/integration/rendering/packet.spec.ts

@@ -1,67 +0,0 @@
-import { imgSnapshotTest } from '../../helpers/util';
-
-describe('packet structure', () => {
-  it('should render a simple packet diagram', () => {
-    imgSnapshotTest(
-      `packet-beta
-  title Hello world
-  0-10: "hello"
-`
-    );
-  });
-
-  it('should render a complex packet diagram', () => {
-    imgSnapshotTest(
-      `packet-beta
-        0-15: "Source Port"
-        16-31: "Destination Port"
-        32-63: "Sequence Number"
-        64-95: "Acknowledgment Number"
-        96-99: "Data Offset"
-        100-105: "Reserved"
-        106: "URG"
-        107: "ACK"
-        108: "PSH"
-        109: "RST"
-        110: "SYN"
-        111: "FIN"
-        112-127: "Window"
-        128-143: "Checksum"
-        144-159: "Urgent Pointer"
-        160-191: "(Options and Padding)"
-        192-223: "data"
-      `
-    );
-  });
-
-  it('should render a complex packet diagram with showBits false', () => {
-    imgSnapshotTest(
-      `
-      ---
-      title: "Packet Diagram"
-      config:
-        packet:
-          showBits: false
-      ---
-      packet-beta
-        0-15: "Source Port"
-        16-31: "Destination Port"
-        32-63: "Sequence Number"
-        64-95: "Acknowledgment Number"
-        96-99: "Data Offset"
-        100-105: "Reserved"
-        106: "URG"
-        107: "ACK"
-        108: "PSH"
-        109: "RST"
-        110: "SYN"
-        111: "FIN"
-        112-127: "Window"
-        128-143: "Checksum"
-        144-159: "Urgent Pointer"
-        160-191: "(Options and Padding)"
-        192-223: "data"
-      `
-    );
-  });
-});

cypress/integration/rendering/pie.spec.ts

@@ -44,7 +44,7 @@ describe('pie chart', () => {
       const style = svg.attr('style');
       expect(style).to.match(/^max-width: [\d.]+px;$/);
       const maxWidthValue = parseFloat(style.match(/[\d.]+/g).join(''));
-      expect(maxWidthValue).to.be.within(590, 600); // depends on installed fonts: 596.2 on my PC, 597.5 on CI
+      expect(maxWidthValue).to.eq(984);
     });
   });
 
@@ -59,7 +59,7 @@ describe('pie chart', () => {
     );
     cy.get('svg').should((svg) => {
       const width = parseFloat(svg.attr('width'));
-      expect(width).to.be.within(590, 600); // depends on installed fonts: 596.2 on my PC, 597.5 on CI
+      expect(width).to.eq(984);
       expect(svg).to.not.have.attr('style');
     });
   });

cypress/integration/rendering/sequencediagram.spec.js

@@ -375,26 +375,6 @@ context('Sequence diagram', () => {
         {}
       );
     });
-    it('should have actor-top and actor-bottom classes on top and bottom actor box and symbol', () => {
-      imgSnapshotTest(
-        `
-        sequenceDiagram
-          actor Bob
-          Alice->>Bob: Hi Bob
-          Bob->>Alice: Hi Alice
-      `,
-        {}
-      );
-      cy.get('.actor').should('have.class', 'actor-top');
-      cy.get('.actor-man').should('have.class', 'actor-top');
-      cy.get('.actor.actor-top').should('not.have.class', 'actor-bottom');
-      cy.get('.actor-man.actor-top').should('not.have.class', 'actor-bottom');
-
-      cy.get('.actor').should('have.class', 'actor-bottom');
-      cy.get('.actor-man').should('have.class', 'actor-bottom');
-      cy.get('.actor.actor-bottom').should('not.have.class', 'actor-top');
-      cy.get('.actor-man.actor-bottom').should('not.have.class', 'actor-top');
-    });
     it('should render long notes left of actor', () => {
       imgSnapshotTest(
         `
@@ -812,34 +792,6 @@ context('Sequence diagram', () => {
     });
   });
   context('links', () => {
-    it('should support actor links', () => {
-      renderGraph(
-        `
-      sequenceDiagram
-        link Alice: Dashboard @ https://dashboard.contoso.com/alice
-        link Alice: Wiki @ https://wiki.contoso.com/alice
-        link John: Dashboard @ https://dashboard.contoso.com/john
-        link John: Wiki @ https://wiki.contoso.com/john
-        Alice->>John: Hello John<br/>
-        John-->>Alice: Great<br/><br/>day!
-      `,
-        { securityLevel: 'loose' }
-      );
-      cy.get('#actor0_popup').should((popupMenu) => {
-        const style = popupMenu.attr('style');
-        expect(style).to.undefined;
-      });
-      cy.get('#root-0').click();
-      cy.get('#actor0_popup').should((popupMenu) => {
-        const style = popupMenu.attr('style');
-        expect(style).to.match(/^display: block;$/);
-      });
-      cy.get('#root-0').click();
-      cy.get('#actor0_popup').should((popupMenu) => {
-        const style = popupMenu.attr('style');
-        expect(style).to.match(/^display: none;$/);
-      });
-    });
     it('should support actor links and properties EXPERIMENTAL: USE WITH CAUTION', () => {
       //Be aware that the syntax for "properties" is likely to be changed.
       imgSnapshotTest(
@@ -978,36 +930,4 @@ context('Sequence diagram', () => {
       });
     });
   });
-  context('render after error', () => {
-    it('should render diagram after fixing destroy participant error', () => {
-      cy.on('uncaught:exception', (err) => {
-        return false;
-      });
-
-      renderGraph([
-        `sequenceDiagram
-    Alice->>Bob: Hello Bob, how are you ?
-    Bob->>Alice: Fine, thank you. And you?
-    create participant Carl
-    Alice->>Carl: Hi Carl!
-    create actor D as Donald
-    Carl->>D: Hi!
-    destroy Carl
-    Alice-xCarl: We are too many
-    destroy Bo
-    Bob->>Alice: I agree`,
-        `sequenceDiagram
-    Alice->>Bob: Hello Bob, how are you ?
-    Bob->>Alice: Fine, thank you. And you?
-    create participant Carl
-    Alice->>Carl: Hi Carl!
-    create actor D as Donald
-    Carl->>D: Hi!
-    destroy Carl
-    Alice-xCarl: We are too many
-    destroy Bob
-    Bob->>Alice: I agree`,
-      ]);
-    });
-  });
 });

cypress/platform/flow-elk.html

@@ -1,28 +0,0 @@
-<html>
-  <body>
-    <pre class="mermaid">
-      flowchart-elk
-      a[hello] --> b[world]
-      b --> c{test}
-      c --> one
-      c --> two
-      c --> three
-    </pre>
-
-    <script type="module">
-      import mermaid from './mermaid.esm.mjs';
-      import elk from './mermaid-flowchart-elk.esm.min.mjs';
-      if (window.location.search.includes('elk')) {
-        await mermaid.registerExternalDiagrams([elk]);
-      }
-      mermaid.initialize({
-        logLevel: 3,
-        startOnLoad: false,
-      });
-      await mermaid.run();
-      if (window.Cypress) {
-        window.rendered = true;
-      }
-    </script>
-  </body>
-</html>

cypress/platform/knsv2.html

@@ -17,30 +17,24 @@
     <style>
       body {
         /* background: rgb(221, 208, 208); */
-        background: #333;
+        /* background:#333; */
         font-family: 'Arial';
         /* font-size: 18px !important; */
       }
       h1 {
         color: grey;
       }
-      .mermaid {
-        border: 1px solid #ddd;
-        margin: 10px;
-      }
       .mermaid2 {
         display: none;
       }
       .mermaid svg {
         /* font-size: 18px !important; */
-        /* background-color: #efefef; */
-        background-color: #333;
-        background-image: radial-gradient(#333 51%, transparent 91%),
-          radial-gradient(#333 51%, transparent 91%);
+        background-color: #efefef;
+        background-image: radial-gradient(#fff 51%, transparent 91%),
+          radial-gradient(#fff 51%, transparent 91%);
         background-size: 20px 20px;
         background-position: 0 0, 10px 10px;
         background-repeat: repeat;
-        border: 2px solid rgb(131, 142, 205);
       }
       .malware {
         position: fixed;
@@ -64,192 +58,46 @@
   </head>
   <body>
     <pre id="diagram" class="mermaid">
-      block-beta
-  blockArrowId<["Label"]>(right)
-  blockArrowId2<["Label"]>(left)
-  blockArrowId3<["Label"]>(up)
-  blockArrowId4<["Label"]>(down)
-  blockArrowId5<["Label"]>(x)
-  blockArrowId6<["Label"]>(y)
-  blockArrowId6<["Label"]>(x, down)
-    </pre>
-    <pre id="diagram" class="mermaid">
-block-beta
-  block:e:4
-    columns 2
-      f
-      g
-  end
-
-    </pre>
-    <pre id="diagram" class="mermaid">
-block-beta
-  block:e:4
-    columns 2
-      f
-      g
-      h
-  end
-
-    </pre>
-    <pre id="diagram" class="mermaid">
-block-beta
-  columns 4
-  a b c d
-  block:e:4
-    columns 2
-      f
-      g
-      h
-  end
-  i:4
+flowchart TB
+    C & D & E & F & G & H & I & J & K & L & M & N & O & P & Q & R & S & T & U & V & W & X & Y & Z & A1 & A2 & A3 & A4 & A5 & A6 & A7 & A8
+      ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
+    C & D & E & F & G & H & I & J & K & L & M & N & O & P & Q & R & S & T & U & V & W & X & Y & Z & A1 & A2 & A3 & A4 & A5 & A6 & A7 & A8
 
     </pre>
     <pre id="diagram" class="mermaid2">
-flowchart LR
-  X-- "y" -->z
+    flowchart TB
+      A & A & A & A & A & A & A & A --->  C & D & E & F & G & H & I & J & K & L & M & N & O & P & Q & R & S & T & U & V & W & X & Y & Z
     </pre>
     <pre id="diagram" class="mermaid2">
-block-beta
-columns 5
-   A space B
-   A --x B
+    flowchart TB
+      A1 & A2 & A3 & A4 & A5 & A6 & A7 & A8 -->  C & D & E & F & G & H & I & J & K & L & M & N & O & P & Q & R & S & T & U & V & W & X & Y & Z
     </pre>
-    <pre id="diagram" class="mermaid2">
-block-beta
-columns 3
-  a["A wide one"] b:2 c:2 d
-    </pre>
-    <pre id="diagram" class="mermaid2">
-block-beta
-  block:e
-      f
-  end
-    </pre>
-    <pre id="diagram" class="mermaid2">
-block-beta
-  columns 3
-  a:3
-  block:e:3
-      f
-  end
-  g
-    </pre>
-    <pre id="diagram" class="mermaid2">
-block-beta
-  columns 3
-  a:3
-  block:e:3
-      f
-      g
-  end
-  h
-  i
-  j
-
-    </pre>
-    <pre id="diagram" class="mermaid2">
-block-beta
-columns 3
-  a b:2
-  block:e:3
-      f
-  end
-  g h i
-    </pre>
-    <pre id="diagram" class="mermaid">
-block-beta
-columns 3
-  a b c
-  e:3
-  f g h
-    </pre>
-    <pre id="diagram" class="mermaid">
-block-beta
-columns 1
-  db(("DB"))
-  blockArrowId6<["&nbsp;&nbsp;&nbsp;"]>(down)
-  block:ID
-    A
-    B["A wide one in the middle"]
-    C
-  end
-  space
-  D
-  ID --> D
-  C --> D
-  style B fill:#f9F,stroke:#333,stroke-width:4px
-    </pre>
-    <pre id="diagram" class="mermaid">
-block-beta
-  columns 5
-  A1:3
-  A2:1
-  A3
-  B1 B2 B3:3
-    </pre>
-    <pre id="diagram" class="mermaid2">
-block-beta
-  block
-    D
-    E
-  end
-  db("This is the text in the box")
-    </pre>
-    <pre id="diagram" class="mermaid2">
-block-beta
-
-      block
-        D
-      end
-      A["A: I am a wide one"]
-    </pre>
-    <pre id="diagram" class="mermaid2">
-block-beta
-    A["square"]
-    B("rounded")
-    C(("circle"))
-    </pre>
-    <pre id="diagram" class="mermaid2">
-block-beta
-    A>"rect_left_inv_arrow"]
-    B{"diamond"}
-    C{{"hexagon"}}
-    </pre>
-    <pre id="diagram" class="mermaid2">
-block-beta
-    A(["stadium"])
-    </pre>
-    <pre id="diagram" class="mermaid2">
-block-beta
-    %% A[["subroutine"]]
-    %% B[("cylinder")]
-    C>"surprise"]
-    </pre>
-    <pre id="diagram" class="mermaid2">
-block-beta
-    A[/"lean right"/]
-    B[\"lean left"\]
-    C[/"trapezoid"\]
-    D[\"trapezoid"/]
-    </pre>
-
     <pre id="diagram" class="mermaid2">
 flowchart
-      B
-      style B fill:#f9F,stroke:#333,stroke-width:4px
-    </pre>
+Node1:::class1 --> Node2:::class2
+Node1:::class1 --> Node3:::class2
+Node3 --> Node4((I am a circle)):::larger
 
+classDef class1 fill:lightblue
+classDef class2 fill:pink
+classDef larger font-size:30px,fill:yellow
+      </pre
+    >
     <pre id="diagram" class="mermaid2">
-      flowchart LR
-      a1 -- apa --> b1
-    </pre>
-
+stateDiagram-v2
+    [*] --> Still
+    Still --> [*]
+    Still --> Moving
+    Moving --> Still
+    Moving --> Crash
+    Crash --> [*]    </pre
+    >
     <pre id="diagram" class="mermaid2">
 flowchart RL
-  subgraph "`one`"
-    id
-  end
+    subgraph "`one`"
+      a1 -- l1 --> a2
+      a1 -- l2 --> a2
+    end
     </pre>
     <pre id="diagram" class="mermaid2">
 flowchart RL
@@ -594,8 +442,14 @@ mindmap
       //   useMaxWidth: false,
       // });
       mermaid.initialize({
-        theme: 'dark',
-        startOnLoad: true,
+        flowchart: { titleTopMargin: 10 },
+        fontFamily: 'courier',
+        sequence: {
+          actorFontFamily: 'courier',
+          noteFontFamily: 'courier',
+          messageFontFamily: 'courier',
+        },
+        fontSize: 16,
         logLevel: 0,
       });
       function callback() {

cypress/support/commands.js

@@ -24,18 +24,8 @@
 // -- This is will overwrite an existing command --
 // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
 
+// import '@percy/cypress';
+
 import { addMatchImageSnapshotCommand } from 'cypress-image-snapshot/command';
 
-// The SSIM comparison method can be used if the pixelmatch is throwing lots of false positives.
-// SSIM actually does not catch minute changes in the image, so it is not as accurate as pixelmatch.
-// addMatchImageSnapshotCommand({
-//   comparisonMethod: 'ssim',
-//   failureThreshold: 0.01,
-//   failureThresholdType: 'percent',
-//   customDiffConfig: {
-//     ssim: 'fast',
-//   },
-//   blur: 1,
-// });
-
 addMatchImageSnapshotCommand();

demos/block.html

@@ -1,139 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns="http://www.w3.org/1999/html">
-  <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <title>Mermaid Block diagram demo page</title>
-    <link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgo=" />
-  </head>
-
-  <body>
-    <h1>Block diagram demos</h1>
-    <pre id="diagram" class="mermaid">
-block-beta
-columns 1
-  db(("DB"))
-  blockArrowId6<["&nbsp;&nbsp;&nbsp;"]>(down)
-  block:ID
-    A
-    B["A wide one in the middle"]
-    C
-  end
-  space
-  D
-  ID --> D
-  C --> D
-  style B fill:#f9F,stroke:#333,stroke-width:4px
-    </pre>
-    <pre id="diagram" class="mermaid">
-block-beta
-    A1["square"]
-    B1("rounded")
-    C1(("circle"))
-    A2>"rect_left_inv_arrow"]
-    B2{"diamond"}
-    C2{{"hexagon"}}
-    </pre>
-
-    <pre id="diagram" class="mermaid">
-block-beta
-    A1(["stadium"])
-    A2[["subroutine"]]
-    B1[("cylinder")]
-    C1>"surprise"]
-    A3[/"lean right"/]
-    B2[\"lean left"\]
-    C2[/"trapezoid"\]
-    D2[\"trapezoid"/]
-    </pre>
-
-    <pre id="diagram" class="mermaid">
-block-beta
-  block:e:4
-    columns 2
-      f
-      g
-  end
-
-    </pre>
-    <pre id="diagram" class="mermaid">
-block-beta
-  block:e:4
-    columns 2
-      f
-      g
-      h
-  end
-
-    </pre>
-    <pre id="diagram" class="mermaid">
-block-beta
-  columns 3
-  a:3
-  block:e:3
-      f
-      g
-  end
-  h
-  i
-  j
-
-    </pre>
-    <pre id="diagram" class="mermaid">
-block-beta
-  columns 4
-  a b c d
-  block:e:4
-    columns 2
-      f
-      g
-      h
-  end
-  i:4
-
-    </pre>
-    <pre id="diagram" class="mermaid">
-flowchart LR
-  X-- "a label" -->z
-    </pre>
-    <pre id="diagram" class="mermaid">
-block-beta
-columns 5
-   A space B
-   A --x B
-    </pre>
-    <pre id="diagram" class="mermaid">
-block-beta
-columns 3
-  a["A wide one"] b:2 c:2 d
-    </pre>
-
-    <pre id="diagram" class="mermaid">
-block-beta
-columns 3
-  a b c
-  e:3
-  f g h
-    </pre>
-
-    <pre id="diagram" class="mermaid">
-block-beta
-
-  A1:3
-  A2:1
-  A3
-    </pre>
-
-    <script type="module">
-      import mermaid from './mermaid.esm.mjs';
-      mermaid.initialize({
-        theme: 'default',
-        logLevel: 3,
-        securityLevel: 'loose',
-        block: {
-          padding: 10,
-        },
-      });
-    </script>
-  </body>
-</html>

demos/dev/example.html

@@ -3,24 +3,10 @@
 <html>
   <head>
     <title>Mermaid development page</title>
-    <style>
-      .container {
-        display: flex;
-        flex-direction: row;
-      }
-
-      #code {
-        max-width: 30vw;
-        width: 30vw;
-      }
-
-      #dynamicDiagram {
-        padding-left: 2em;
-        flex: 1;
-      }
-    </style>
   </head>
   <body>
+    <pre class="mermaid">info</pre>
+
     <pre id="diagram" class="mermaid">
 graph TB
       a --> b
@@ -29,35 +15,22 @@ graph TB
       c --> d
     </pre>
 
-    <hr />
-    Type code to view diagram:
-    <div class="container">
-      <textarea name="code" id="code" cols="30" rows="10"></textarea>
-      <div id="dynamicDiagram"></div>
-    </div>
-    <pre class="mermaid">info</pre>
+    <div id="dynamicDiagram"></div>
 
     <script type="module">
       import mermaid from '/mermaid.esm.mjs';
-      async function render(str) {
-        const { svg } = await mermaid.render('dynamic', str);
-        document.getElementById('dynamicDiagram').innerHTML = svg;
-      }
-      const storeKey = window.location.pathname;
-      const code = localStorage.getItem(storeKey);
-      if (code) {
-        document.getElementById('code').value = code;
-        await render(code);
-      }
+      mermaid.parseError = function (err, hash) {
+        console.error('Mermaid error: ', err);
+      };
       mermaid.initialize({
         startOnLoad: true,
         logLevel: 0,
       });
-      document.getElementById('code').addEventListener('input', async (e) => {
-        const value = e.target.value;
-        localStorage.setItem(storeKey, value);
-        await render(value);
-      });
+      const value = `graph TD\nHello --> World`;
+      const el = document.getElementById('dynamicDiagram');
+      const { svg } = await mermaid.render('dd', value);
+      console.log(svg);
+      el.innerHTML = svg;
     </script>
 
     <script src="/dev/reload.js"></script>

demos/flowchart.html

@@ -1102,57 +1102,6 @@
     </pre>
     <hr />
 
-    <h2>Sample 20</h2>
-    <h3>graph</h3>
-    <pre class="mermaid">
-      graph LR
-      A["$$f(\relax{x}) = \int_{-\infty}^\infty \hat{f}(\xi)\,e^{2 \pi i \xi x}\,d\xi$$"] -->|"$$\Bigg(\bigg(\Big(\big((\frac{-b\pm\sqrt{b^2-4ac}}{2a})\big)\Big)\bigg)\Bigg)$$"| B("$$1+\frac{e^{-2\pi}} {1+\frac{e^{-4\pi}} {1+\frac{e^{-6\pi}} {1+\frac{e^{-8\pi}} {1+\cdots}}}}$$")
-      A -->|"$$\overbrace{a+b+c}^{\text{note}}$$"| C("$$\phase{-78^\circ}$$")
-      B --> D("$$x = \begin{cases} a &\text{if } b \\ c &\text{if } d \end{cases}$$")
-      C --> E("$$x(t)=c_1\begin{bmatrix}-\cos{t}+\sin{t}\\ 2\cos{t} \end{bmatrix}e^{2t}$$")
-    </pre>
-    <hr />
-
-    <h3>flowchart</h3>
-    <pre class="mermaid">
-      flowchart LR
-      A["$$f(\relax{x}) = \int_{-\infty}^\infty \hat{f}(\xi)\,e^{2 \pi i \xi x}\,d\xi$$"] -->|"$$\Bigg(\bigg(\Big(\big((\frac{-b\pm\sqrt{b^2-4ac}}{2a})\big)\Big)\bigg)\Bigg)$$"| B("$$1+\frac{e^{-2\pi}} {1+\frac{e^{-4\pi}} {1+\frac{e^{-6\pi}} {1+\frac{e^{-8\pi}} {1+\cdots}}}}$$")
-      A -->|"$$\overbrace{a+b+c}^{\text{note}}$$"| C("$$\phase{-78^\circ}$$")
-      B --> D("$$x = \begin{cases} a &\text{if } b \\ c &\text{if } d \end{cases}$$")
-      C --> E("$$x(t)=c_1\begin{bmatrix}-\cos{t}+\sin{t}\\ 2\cos{t} \end{bmatrix}e^{2t}$$")
-    </pre>
-    <hr />
-
-    <h2>Sample 21</h2>
-    <h3>graph</h3>
-    <pre class="mermaid">
-      graph LR
-      A["$$\alpha\beta\gamma\delta\epsilon\zeta\eta\theta\iota\kappa\lambda\mu\nu\xi\omicron\pi\rho\sigma\tau\upsilon\phi\chi\psi\omega$$"] --> B["$$\Alpha\Beta\Gamma\Delta\Epsilon\Zeta\Eta\Theta\Iota\Kappa\Lambda\Mu\Nu\Xi\Omicron\Pi\Rho\Sigma\Tau\Upsilon\Phi\Chi\Psi\Omega$$"]
-    </pre>
-    <hr />
-
-    <h3>flowchart</h3>
-    <pre class="mermaid">
-      graph LR
-      A["$$\alpha\beta\gamma\delta\epsilon\zeta\eta\theta\iota\kappa\lambda\mu\nu\xi\omicron\pi\rho\sigma\tau\upsilon\phi\chi\psi\omega$$"] --> B["$$\Alpha\Beta\Gamma\Delta\Epsilon\Zeta\Eta\Theta\Iota\Kappa\Lambda\Mu\Nu\Xi\Omicron\Pi\Rho\Sigma\Tau\Upsilon\Phi\Chi\Psi\Omega$$"]
-    </pre>
-    <hr />
-
-    <h2>Sample 22</h2>
-    <h3>graph</h3>
-    <pre class="mermaid">
-      graph LR
-      A["$$\forall\complement\therefore\emptyset\exists\subset\because\empty\exist\supset\mapsto\varnothing\nexists\mid\to\implies\in\land\gets\impliedby\isin\lor\leftrightarrow\iff\notin\ni\notni\lnot$$"] --> B["$$\nabla\Im\Reals\jmath\partial\image\wp\aleph\Game\weierp\alef\Finv\N\Z\alefsym\cnums\natnums\beth\Complex\R\gimel\ell\Re\daleth\hbar\real\eth\hslash\reals$$"]
-    </pre>
-    <hr />
-
-    <h3>flowchart</h3>
-    <pre class="mermaid">
-      graph LR
-      A["$$\forall\complement\therefore\emptyset\exists\subset\because\empty\exist\supset\mapsto\varnothing\nexists\mid\to\implies\in\land\gets\impliedby\isin\lor\leftrightarrow\iff\notin\ni\notni\lnot$$"] --> B["$$\nabla\Im\Reals\jmath\partial\image\wp\aleph\Game\weierp\alef\Finv\N\Z\alefsym\cnums\natnums\beth\Complex\R\gimel\ell\Re\daleth\hbar\real\eth\hslash\reals$$"]
-    </pre>
-    <hr />
-
     <hr />
 
     <pre class="mermaid">
@@ -1575,11 +1524,11 @@
       F{Flow 2} == Choice 2.1 ==> H[Feedback node]
       H[Feedback node] ==> B[Step 1]
       F{Flow 2} == Choice 2.2 ==> G((Finish))
-
+      
       linkStyle 0,1,4,6,7,8,9 stroke:gold, stroke-width:4px
 
       classDef active_node fill:#0CF,stroke:#09F,stroke-width:6px
-      classDef unactive_node fill:#e0e0e0,stroke:#bdbdbd,stroke-width:3px
+      classDef unactive_node fill:#e0e0e0,stroke:#bdbdbd,stroke-width:3px      
       classDef bugged_node fill:#F88,stroke:#F22,stroke-width:3px
       classDef start_node,finish_node fill:#3B1,stroke:#391,stroke-width:8px
 

demos/gantt.html

@@ -30,21 +30,6 @@
     </pre>
     <hr />
 
-    <pre class="mermaid">
-      gantt
-        title #; Gantt Diagrams Allow Semicolons and Hashtags #;!
-        accTitle: A simple sample gantt diagram
-        accDescr: 2 sections with 2 tasks each, from 2014
-        dateFormat  YYYY-MM-DD
-        section #;Section
-        #;A task           :a1, 2014-01-01, 30d
-        #;Another task     :after a1  , 20d
-        section #;Another
-        Task in sec      :2014-01-12  , 12d
-        another task      : 24d
-    </pre>
-    <hr />
-
     <pre class="mermaid">
     gantt
       title Airworks roadmap

demos/git.html

@@ -14,364 +14,30 @@
   </head>
 
   <body>
-    <h1>Git graph demo</h1>
-    <h2>Simple "branch and merge" graph</h2>
+    <h1>Git diagram demo</h1>
     <pre class="mermaid">
     ---
-    title: Simple "branch and merge" (left-to-right)
+    title: Simple Git diagram
     ---
-    gitGraph LR:
+    gitGraph:
+    options
+    {
+    "nodeSpacing": 50,
+    "nodeRadius": 5
+    }
+    end
+    branch master
     commit
     branch newbranch
     checkout newbranch
     commit
-    checkout main
-    merge newbranch
-    </pre>
-    <pre class="mermaid">
-    ---
-    title: Simple "branch and merge" (top-to-bottom)
-    ---
-    gitGraph TB:
     commit
-    branch newbranch
-    checkout newbranch
+    checkout master
     commit
-    checkout main
-    merge newbranch
-    </pre>
-    <h2>Continuous development graph</h2>
-    <pre class="mermaid">
-    ---
-    title: Continuous development (left-to-right)
-    ---
-    gitGraph LR:
-    commit
-    branch develop
-    checkout develop
-    commit
-    checkout main
-    merge develop
-    checkout develop
-    commit
-    checkout main
-    merge develop
-    </pre>
-    <pre class="mermaid">
-    ---
-    title: Continuous development (top-to-bottom)
-    ---
-    gitGraph TB:
-    commit
-    branch develop
-    checkout develop
-    commit
-    checkout main
-    merge develop
-    checkout develop
-    commit
-    checkout main
-    merge develop
-    </pre>
-    <h2>Merge feature to advanced main graph</h2>
-    <pre class="mermaid">
-    ---
-    title: Merge feature to advanced main (left-to-right)
-    ---
-    gitGraph LR:
-    commit
-    branch newbranch
-    checkout newbranch
-    commit
-    checkout main
     commit
     merge newbranch
     </pre>
-    <pre class="mermaid">
-    ---
-    title: Merge feature to advanced main (top-to-bottom)
-    ---
-    gitGraph TB:
-    commit
-    branch newbranch
-    checkout newbranch
-    commit
-    checkout main
-    commit
-    merge newbranch
-    </pre>
-    <h2>Two-way merges</h2>
-    <pre class="mermaid">
-    ---
-    title: Two-way merges (left-to-right)
-    ---
-    gitGraph LR:
-    commit
-    branch develop
-    checkout develop
-    commit
-    checkout main
-    merge develop
-    commit
-    checkout develop
-    merge main
-    commit
-    checkout main
-    merge develop
-    </pre>
-    <pre class="mermaid">
-    ---
-    title: Two-way merges (top-to-bottom)
-    ---
-    gitGraph TB:
-    commit
-    branch develop
-    checkout develop
-    commit
-    checkout main
-    merge develop
-    commit
-    checkout develop
-    merge main
-    commit
-    checkout main
-    merge develop
-    </pre>
-    <h2>Cherry-pick from branch graph</h2>
-    <pre class="mermaid">
-    ---
-    title: Cherry-pick from branch (left-to-right)
-    ---
-    gitGraph LR:
-    commit
-    branch newbranch
-    checkout newbranch
-    commit id: "Pick me"
-    checkout main
-    commit
-    checkout newbranch
-    commit
-    checkout main
-    cherry-pick id: "Pick me"
-    </pre>
-    <pre class="mermaid">
-    ---
-    title: Cherry-pick from branch (top-to-bottom)
-    ---
-    gitGraph TB:
-    commit
-    branch newbranch
-    checkout newbranch
-    commit id: "Pick me"
-    checkout main
-    commit
-    checkout newbranch
-    commit
-    checkout main
-    cherry-pick id: "Pick me"
-    </pre>
-    <h2>Cherry-pick from main graph</h2>
-    <pre class="mermaid">
-    ---
-    title: Cherry-pick from main (left-to-right)
-    ---
-    gitGraph LR:
-    commit
-    branch develop
-    commit
-    checkout main
-    commit id:"A"
-    checkout develop
-    commit
-    cherry-pick id: "A"
-    </pre>
-    <pre class="mermaid">
-    ---
-    title: Cherry-pick from main (top-to-bottom)
-    ---
-    gitGraph TB:
-    commit
-    branch develop
-    commit
-    checkout main
-    commit id:"A"
-    checkout develop
-    commit
-    cherry-pick id: "A"
-    </pre>
-    <h2>Cherry-pick then merge graph</h2>
-    <pre class="mermaid">
-    ---
-    title: Cherry-pick then merge (left-to-right)
-    ---
-    gitGraph LR:
-    commit
-    branch newbranch
-    checkout newbranch
-    commit id: "Pick me"
-    checkout main
-    commit
-    checkout newbranch
-    commit
-    checkout main
-    cherry-pick id: "Pick me"
-    merge newbranch
-    </pre>
-    <pre class="mermaid">
-    ---
-    title: Cherry-pick then merge (top-to-bottom)
-    ---
-    gitGraph TB:
-    commit
-    branch newbranch
-    checkout newbranch
-    commit id: "Pick me"
-    checkout main
-    commit
-    checkout newbranch
-    commit
-    checkout main
-    cherry-pick id: "Pick me"
-    merge newbranch
-    </pre>
-    <h2>Merge from main onto undeveloped branch graph</h2>
-    <pre class="mermaid">
-    ---
-    title: Merge from main onto undeveloped branch (left-to-right)
-    ---
-    gitGraph LR:
-    commit
-    branch develop
-    commit
-    checkout main
-    commit
-    checkout develop
-    merge main
-    </pre>
-    <pre class="mermaid">
-    ---
-    title: Merge from main onto undeveloped branch (top-to-bottom)
-    ---
-    gitGraph TB:
-    commit
-    branch develop
-    commit
-    checkout main
-    commit
-    checkout develop
-    merge main
-    </pre>
-    <h2>Merge from main onto developed branch graph</h2>
-    <pre class="mermaid">
-    ---
-    title: Merge from main onto developed branch (left-to-right)
-    ---
-    gitGraph LR:
-    commit
-    branch develop
-    commit
-    checkout main
-    commit
-    checkout develop
-    commit
-    merge main
-    </pre>
-    <pre class="mermaid">
-    ---
-    title: Merge from main onto developed branch (top-to-bottom)
-    ---
-    gitGraph TB:
-    commit
-    branch develop
-    commit
-    checkout main
-    commit
-    checkout develop
-    commit
-    merge main
-    </pre>
-    <h2>Two branches from same commit graph</h2>
-    <pre class="mermaid">
-    ---
-    title: Two branches from same commit (left-to-right)
-    ---
-    gitGraph LR:
-    commit
-    commit
-    branch feature-001
-    commit
-    commit
-    checkout main
-    branch feature-002
-    commit
-    checkout feature-001
-    merge feature-002
-    </pre>
-    <pre class="mermaid">
-    ---
-    title: Two branches from same commit (top-to-bottom)
-    ---
-    gitGraph TB:
-    commit
-    commit
-    branch feature-001
-    commit
-    commit
-    checkout main
-    branch feature-002
-    commit
-    checkout feature-001
-    merge feature-002
-    </pre>
-    <h2>Three branches and a cherry-pick from each graph</h2>
-    <pre class="mermaid">
-    ---
-    title: Three branches and a cherry-pick from each (left-to-right)
-    ---
-    gitGraph LR:
-    commit id: "ZERO"
-    branch develop
-    commit id:"A"
-    checkout main
-    commit id:"ONE"
-    checkout develop
-    commit id:"B"
-    branch featureA
-    commit id:"FIX"
-    commit id: "FIX-2"
-    checkout main
-    commit id:"TWO"
-    cherry-pick id:"A"
-    commit id:"THREE"
-    cherry-pick id:"FIX"
-    checkout develop
-    commit id:"C"
-    merge featureA
-    </pre>
-    <pre class="mermaid">
-    ---
-    title: Three branches and a cherry-pick from each (top-to-bottom)
-    ---
-    gitGraph TB:
-    commit id: "ZERO"
-    branch develop
-    commit id:"A"
-    checkout main
-    commit id:"ONE"
-    checkout develop
-    commit id:"B"
-    branch featureA
-    commit id:"FIX"
-    commit id: "FIX-2"
-    checkout main
-    commit id:"TWO"
-    cherry-pick id:"A"
-    commit id:"THREE"
-    cherry-pick id:"FIX"
-    checkout develop
-    commit id:"C"
-    merge featureA
-    </pre>
+
     <script type="module">
       import mermaid from './mermaid.esm.mjs';
       const ALLOWED_TAGS = [

demos/index.html

@@ -81,12 +81,6 @@
       <li>
         <h2><a href="./sankey.html">Sankey</a></h2>
       </li>
-      <li>
-        <h2><a href="./packet.html">Packet</a></h2>
-      </li>
-      <li>
-        <h2><a href="./block.html">Layered Blocks</a></h2>
-      </li>
     </ul>
   </body>
 </html>

demos/packet.html

@@ -1,141 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <title>Mermaid Quick Test Page</title>
-    <link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgo=" />
-    <style>
-      div.mermaid {
-        font-family: 'Courier New', Courier, monospace !important;
-      }
-    </style>
-  </head>
-
-  <body>
-    <h1>Packet diagram demo</h1>
-
-    <div class="diagrams">
-      <pre class="mermaid">
-      packet-beta
-        0-15: "Source Port"
-        16-31: "Destination Port"
-        32-63: "Sequence Number"
-        64-95: "Acknowledgment Number"
-        96-99: "Data Offset"
-        100-105: "Reserved"
-        106: "URG"
-        107: "ACK"
-        108: "PSH"
-        109: "RST"
-        110: "SYN"
-        111: "FIN"
-        112-127: "Window"
-        128-143: "Checksum"
-        144-159: "Urgent Pointer"
-        160-191: "(Options and Padding)"
-        192-223: "data"
-    </pre
-      >
-
-      <pre class="mermaid">
-      ---
-      config:
-        packet:
-          showBits: false
-      ---
-      packet-beta
-        0-15: "Source Port"
-        16-31: "Destination Port"
-        32-63: "Sequence Number"
-        64-95: "Acknowledgment Number"
-        96-99: "Data Offset"
-        100-105: "Reserved"
-        106: "URG"
-        107: "ACK"
-        108: "PSH"
-        109: "RST"
-        110: "SYN"
-        111: "FIN"
-        112-127: "Window"
-        128-143: "Checksum"
-        144-159: "Urgent Pointer"
-        160-191: "(Options and Padding)"
-        192-223: "data"
-    </pre
-      >
-
-      <pre class="mermaid">
-      ---
-      config:
-        theme: forest
-      ---
-      packet-beta
-        title Forest theme
-        0-15: "Source Port"
-        16-31: "Destination Port"
-        32-63: "Sequence Number"
-        64-95: "Acknowledgment Number"
-        96-99: "Data Offset"
-        100-105: "Reserved"
-        106: "URG"
-        107: "ACK"
-        108: "PSH"
-        109: "RST"
-        110: "SYN"
-        111: "FIN"
-        112-127: "Window"
-        128-143: "Checksum"
-        144-159: "Urgent Pointer"
-        160-191: "(Options and Padding)"
-        192-223: "data"
-    </pre
-      >
-
-      <pre class="mermaid" style="background-color: black">
-      ---
-      config:
-        theme: dark
-      ---
-      packet-beta
-        title Dark theme
-        0-15: "Source Port"
-        16-31: "Destination Port"
-        32-63: "Sequence Number"
-        64-95: "Acknowledgment Number"
-        96-99: "Data Offset"
-        100-105: "Reserved"
-        106: "URG"
-        107: "ACK"
-        108: "PSH"
-        109: "RST"
-        110: "SYN"
-        111: "FIN"
-        112-127: "Window"
-        128-143: "Checksum"
-        144-159: "Urgent Pointer"
-        160-191: "(Options and Padding)"
-        192-223: "data"
-    </pre
-      >
-    </div>
-    <script type="module">
-      import mermaid from '/mermaid.esm.mjs';
-      mermaid.initialize({
-        logLevel: 3,
-        securityLevel: 'loose',
-      });
-    </script>
-
-    <style>
-      .diagrams {
-        display: flex;
-        flex-wrap: wrap;
-      }
-      pre {
-        width: 45vw;
-        padding: 2em;
-      }
-    </style>
-  </body>
-</html>

demos/pie.html

@@ -15,7 +15,7 @@
   <body>
     <h1>Pie chart demos</h1>
     <pre class="mermaid">
-      pie title Default text position: Animal adoption
+      pie title Pets adopted by volunteers
         accTitle: simple pie char demo
         accDescr: pie chart with 3 sections: dogs, cats, rats. Most are dogs.
         "Dogs": 386
@@ -27,7 +27,7 @@
     <pre class="mermaid">
       %%{init: {"pie": {"textPosition": 0.9}, "themeVariables": {"pieOuterStrokeWidth": "5px"}}}%%
       pie
-        title Offset labels close to border: Product X
+        title Key elements in Product X
         accTitle: Key elements in Product X
         accDescr: This is a pie chart showing the key elements in Product X.
         "Calcium": 42.96
@@ -36,19 +36,6 @@
         "Iron": 5
     </pre>
 
-    <pre class="mermaid">
-      %%{init: {"pie": {"textPosition": 0.45}, "themeVariables": {"pieOuterStrokeWidth": "5px"}}}%%
-      pie
-        title Centralized labels: Languages
-        accTitle: Key elements in Product X
-        accDescr: This is a pie chart showing the key elements in Product X.
-        "JavaScript": 30
-        "Python": 25
-        "Java": 20
-        "C#": 15
-        "Others": 10
-    </pre>
-
     <script type="module">
       import mermaid from '/mermaid.esm.mjs';
       mermaid.initialize({

demos/sankey.html

@@ -33,7 +33,6 @@
       ---
       config:
         sankey:
-          useMaxWidth: true
           showValues: false
           width: 1200
           height: 600

demos/sequence.html

@@ -16,74 +16,50 @@
   <body>
     <h1>Sequence diagram demos</h1>
     <pre class="mermaid">
-    sequenceDiagram
-      accTitle: test the accTitle
-      accDescr: Test a description
+		sequenceDiagram
+			accTitle: test the accTitle
+			accDescr: Test a description
 
 			participant Alice
 			participant Bob
 			participant John as John<br />Second Line
-			link Alice: Dashboard @ https://dashboard.contoso.com/alice
-			link Alice: Wiki @ https://wiki.contoso.com/alice
-			link John: Dashboard @ https://dashboard.contoso.com/john
-			link John: Wiki @ https://wiki.contoso.com/john
 			autonumber 10 10
 			rect rgb(200, 220, 100)
 			rect rgb(200, 255, 200)
 
-      Alice ->> Bob: Hello Bob, how are you?
-      Bob-->>John: How about you John?
-      end
+			Alice ->> Bob: Hello Bob, how are you?
+			Bob-->>John: How about you John?
+			end
 
-      Bob--x Alice: I am good thanks!
-      Bob-x John: I am good thanks!
-      Note right of John: John thinks a long<br />long time, so long<br />that the text does<br />not fit on a row.
+			Bob--x Alice: I am good thanks!
+			Bob-x John: I am good thanks!
+			Note right of John: John thinks a long<br />long time, so long<br />that the text does<br />not fit on a row.
 
-      Bob-->Alice: Checking with John...
-      Note over John:wrap: John looks like he's still thinking, so Bob prods him a bit.
-      Bob-x John: Hey John - we're still waiting to know<br />how you're doing
-      Note over John:nowrap: John's trying hard not to break his train of thought.
-      Bob-x John:wrap: John! Are you still debating about how you're doing? How long does it take??
-      Note over John: After a few more moments, John<br />finally snaps out of it.
-      end
+			Bob-->Alice: Checking with John...
+			Note over John:wrap: John looks like he's still thinking, so Bob prods him a bit.
+			Bob-x John: Hey John - we're still waiting to know<br />how you're doing
+			Note over John:nowrap: John's trying hard not to break his train of thought.
+			Bob-x John:wrap: John! Are you still debating about how you're doing? How long does it take??
+			Note over John: After a few more moments, John<br />finally snaps out of it.
+			end
 
-      autonumber off
-      alt either this
-      Alice->>+John: Yes
-      John-->>-Alice: OK
-      else or this
-      autonumber
-      Alice->>John: No
-      else or this will happen
-      Alice->John: Maybe
-      end
-      autonumber 200
-      par this happens in parallel
-      Alice -->> Bob: Parallel message 1
-      and
-      Alice -->> John: Parallel message 2
-      end
-  </pre>
-    <hr />
-    <pre class="mermaid">
-    ---
-    title: With forced menus
-    config:
-      sequence:
-        forceMenus: true
-    ---
-    sequenceDiagram
-      participant Alice
-      participant John
-      link Alice: Dashboard @ https://dashboard.contoso.com/alice
-      link Alice: Wiki @ https://wiki.contoso.com/alice
-      link John: Dashboard @ https://dashboard.contoso.com/john
-      link John: Wiki @ https://wiki.contoso.com/john
-      Alice->>John: Hello John, how are you?
-      John-->>Alice: Great!
-      Alice-)John: See you later!
-  </pre
-    >
+			autonumber off
+			alt either this
+			Alice->>+John: Yes
+			John-->>-Alice: OK
+			else or this
+			autonumber
+			Alice->>John: No
+			else or this will happen
+			Alice->John: Maybe
+			end
+			autonumber 200
+			par this happens in parallel
+			Alice -->> Bob: Parallel message 1
+			and
+			Alice -->> John: Parallel message 2
+			end
+	</pre>
     <hr />
     <pre class="mermaid">
     sequenceDiagram
@@ -153,18 +129,18 @@
     <hr />
 
     <pre class="mermaid">
-        sequenceDiagram
-        box lightgreen Alice & John
-        participant A
-        participant J
-        end
-        box Another Group very very long description not wrapped
-        participant B
-        end
-        A->>J: Hello John, how are you?
-        J->>A: Great!
-        A->>B: Hello Bob, how are you ?
-        </pre
+      sequenceDiagram
+      box lightgreen Alice & John
+      participant A
+      participant J
+      end
+      box Another Group very very long description not wrapped
+      participant B
+      end
+      A->>J: Hello John, how are you?
+      J->>A: Great!
+      A->>B: Hello Bob, how are you ?
+      </pre
     >
     <hr />
 
@@ -187,49 +163,6 @@
         Note left of Bob: Alice/Bob Note
       end
     </pre>
-    <pre class="mermaid">
-      sequenceDiagram
-        actor Alice
-        actor John
-        Alice-xJohn: Hello John, how are you?
-        John--xAlice: Great!
-    </pre>
-
-    <hr />
-
-    <pre class="mermaid">
-    sequenceDiagram
-    participant 1 as $$\frac{\lim_{x\rightarrow0}{\frac{1}{x}}}{\frac{-b\pm\sqrt{b^2-4ac}}{2a}}$$
-    participant 2 as $$\beta$$
-    participant 3 as $$\delta$$
-    participant 4 as $$\frac{\frac{\lim_{x\rightarrow0}{\frac{1}{x}}}{\frac{-b\pm\sqrt{b^2-4ac}}{2a}}}{\frac{\text{d}}{\text{d}x}{x^2}}$$
-    1->>2: $$\sqrt{2}$$
-    note right of 2: $$\frac{1+\frac{1+\frac{1+\frac{1}{2}}{2}}{2}}{2}+\frac{-b\pm\sqrt{b^2-4ac}}{2a}$$
-    2->>3: $$\frac{\lim_{x\rightarrow0}{\frac{1}{x}}}{\frac{-b\pm\sqrt{b^2-4ac}}{2a}}$$
-    note right of 3: $$\frac{-b\pm\sqrt{b^2-4ac}}{2a}$$
-    3->>4: $$\lim_{x\rightarrow0}{\frac{1}{x}}$$;
-    note right of 4: multiline
-    4->>1: multiline<br />using #lt;br /#gt;
-    note right of 1: multiline<br />$$\frac{1}{2}$$<br />3rd line
-    </pre>
-    <hr />
-    <pre class="mermaid">
-      sequenceDiagram
-      autonumber
-      participant 1 as $$\alpha$$lex
-      participant 2 as $$\beta$$ob
-      participant 3 as $$\theta$$iffany
-      1->>2: Hello John, does&nbsp; $$\frac{1}{2}+1=2$$?
-      loop $$\frac{1}{2}+1=2$$
-          2->>2: $$\frac{1}{2}+1=\frac{3}{2}$$
-      end
-      Note right of 2: $$x = \begin{cases} 1 &\text{if } \frac{1}{2}+1=2 \\ 0 &\text{if } \frac{1}{2}+1\ne2 \end{cases}$$
-      2-->>1: $$\frac{1}{2}+1\ne2\implies 1$$
-      2->>3: $$\frac{\text{d}}{\text{d}x}{3x^2+2x+1}$$
-      3-->>2: $$6x+2$$
-    </pre>
-
-    <hr />
 
     <pre class="mermaid">
     sequenceDiagram

demos/xychart.html

@@ -137,7 +137,7 @@ config:
     plotReservedSpacePercent: 60
 ---
     xychart-beta
-      title "Sales Revenue"
+      title "Sales Revene"
       x-axis Months [jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec]
       y-axis "Revenue (in $)" 4000 --> 11000
       bar [5000, 6000, 7500, 8200, 9500, 10500, 11000, 10200, 9200, 8500, 7000, 6000]
@@ -163,7 +163,7 @@ config:
       plotColorPalette: "#008000, #faba63"
 ---
     xychart-beta
-      title "Sales Revenue"
+      title "Sales Revene"
       x-axis Months [jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec]
       y-axis "Revenue (in $)" 4000 --> 11000
       bar [5000, 6000, 7500, 8200, 9500, 10500, 11000, 10200, 9200, 8500, 7000, 6000]

docker-compose.yml

@@ -1,16 +1,13 @@
 version: '3.9'
 services:
   mermaid:
-    build:
-      context: .
-      dockerfile: Dockerfile
+    image: node:18.18.2-alpine3.18
     stdin_open: true
     tty: true
     working_dir: /mermaid
-    mem_limit: '8G'
-    entrypoint: docker-entrypoint.sh
+    mem_limit: '4G'
     environment:
-      - NODE_OPTIONS=--max_old_space_size=8192
+      - NODE_OPTIONS=--max_old_space_size=4096
     volumes:
       - ./:/mermaid
       - root_cache:/root/.cache

docker-entrypoint.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-source /root/.shrc
-exec "$@"

docs/community/code.md

@@ -0,0 +1,176 @@
+> **Warning**
+>
+> ## THIS IS AN AUTOGENERATED FILE. DO NOT EDIT.
+>
+> ## Please edit the corresponding file in [/packages/mermaid/src/docs/community/code.md](../../packages/mermaid/src/docs/community/code.md).
+
+# Contributing Code
+
+The basic steps for contributing code are:
+
+```mermaid-example
+graph LR
+    git[1. Checkout a  git branch] --> codeTest[2. Write tests and code] --> doc[3. Update documentation] --> submit[4. Submit a PR] --> review[5. Review and merge]
+```
+
+```mermaid
+graph LR
+    git[1. Checkout a  git branch] --> codeTest[2. Write tests and code] --> doc[3. Update documentation] --> submit[4. Submit a PR] --> review[5. Review and merge]
+```
+
+1.  **Create** and checkout a git branch and work on your code in the branch
+2.  Write and update **tests** (unit and perhaps even integration (e2e) tests) (If you do TDD/BDD, the order might be different.)
+3.  **Let users know** that things have changed or been added in the documents! This is often overlooked, but _critical_
+4.  **Submit** your code as a _pull request_.
+5.  Maintainers will **review** your code. If there are no changes necessary, the PR will be merged. Otherwise, make the requested changes and repeat.
+
+## 1. Checkout a git branch
+
+Mermaid uses a [Git Flow](https://guides.github.com/introduction/flow/)–inspired approach to branching.
+
+Development is done in the `develop` branch.
+
+Once development is done we create a `release/vX.X.X` branch from `develop` for testing.
+
+Once the release happens we add a tag to the `release` branch and merge it with `master`. The live product and on-line documentation are what is in the `master` branch.
+
+**All new work should be based on the `develop` branch.**
+
+**When you are ready to do work, always, ALWAYS:**
+
+1.  Make sure you have the most up-to-date version of the `develop` branch. (fetch or pull to update it)
+2.  Check out the `develop` branch
+3.  Create a new branch for your work. Please name the branch following our naming convention below.
+
+We use the following naming convention for branches:
+
+```txt
+   [feature | bug | chore | docs]/[issue number]_[short description using dashes ('-') or underscores ('_') instead of spaces]
+```
+
+You can always check current [configuration of labelling and branch prefixes](https://github.com/mermaid-js/mermaid/blob/develop/.github/pr-labeler.yml)
+
+- The first part is the **type** of change: a feature, bug, chore, or documentation change ('docs')
+- followed by a _slash_ (which helps to group like types together in many git tools)
+- followed by the **issue number**
+- followed by an _underscore_ ('\_')
+- followed by a short text description (but use dashes ('-') or underscores ('\_') instead of spaces)
+
+If your work is specific to a single diagram type, it is a good idea to put the diagram type at the start of the description. This will help us keep release notes organized: it will help us keep changes for a diagram type together.
+
+**Ex: A new feature described in issue 2945 that adds a new arrow type called 'florbs' to state diagrams**
+
+`feature/2945_state-diagram-new-arrow-florbs`
+
+**Ex: A bug described in issue 1123 that causes random ugly red text in multiple diagram types**
+`bug/1123_fix_random_ugly_red_text`
+
+## 2. Write Tests
+
+Tests ensure that each function, module, or part of code does what it says it will do. This is critically
+important when other changes are made to ensure that existing code is not broken (no regression).
+
+Just as important, the tests act as _specifications:_ they specify what the code does (or should do).
+Whenever someone is new to a section of code, they should be able to read the tests to get a thorough understanding of what it does and why.
+
+If you are fixing a bug, you should add tests to ensure that your code has actually fixed the bug, to specify/describe what the code is doing, and to ensure the bug doesn't happen again.
+(If there had been a test for the situation, the bug never would have happened in the first place.)
+You may need to change existing tests if they were inaccurate.
+
+If you are adding a feature, you will definitely need to add tests. Depending on the size of your feature, you may need to add integration tests.
+
+### Unit Tests
+
+Unit tests are tests that test a single function or module. They are the easiest to write and the fastest to run.
+
+Unit tests are mandatory all code except the renderers. (The renderers are tested with integration tests.)
+
+We use [Vitest](https://vitest.dev) to run unit tests.
+
+You can use the following command to run the unit tests:
+
+```sh
+pnpm test
+```
+
+When writing new tests, it's easier to have the tests automatically run as you make changes. You can do this by running the following command:
+
+```sh
+pnpm test:watch
+```
+
+### Integration/End-to-End (e2e) tests
+
+These test the rendering and visual appearance of the diagrams.
+This ensures that the rendering of that feature in the e2e will be reviewed in the release process going forward. Less chance that it breaks!
+
+To start working with the e2e tests:
+
+1.  Run `pnpm dev` to start the dev server
+2.  Start **Cypress** by running `pnpm cypress:open`.
+
+The rendering tests are very straightforward to create. There is a function `imgSnapshotTest`, which takes a diagram in text form and the mermaid options, and it renders that diagram in Cypress.
+
+When running in CI it will take a snapshot of the rendered diagram and compare it with the snapshot from last build and flag it for review if it differs.
+
+This is what a rendering test looks like:
+
+```js
+it('should render forks and joins', () => {
+  imgSnapshotTest(
+    `
+    stateDiagram
+    state fork_state <<fork>>
+      [*] --> fork_state
+      fork_state --> State2
+      fork_state --> State3
+
+      state join_state <<join>>
+      State2 --> join_state
+      State3 --> join_state
+      join_state --> State4
+      State4 --> [*]
+    `,
+    { logLevel: 0 }
+  );
+  cy.get('svg');
+});
+```
+
+**_\[TODO - running the tests against what is expected in development. ]_**
+
+**_\[TODO - how to generate new screenshots]_**
+....
+
+## 3. Update Documentation
+
+If the users have no way to know that things have changed, then you haven't really _fixed_ anything for the users; you've just added to making Mermaid feel broken.
+Likewise, if users don't know that there is a new feature that you've implemented, it will forever remain unknown and unused.
+
+The documentation has to be updated to users know that things have changed and added!
+If you are adding a new feature, add `(v<MERMAID_RELEASE_VERSION>+)` in the title or description. It will be replaced automatically with the current version number when the release happens.
+
+eg: `# Feature Name (v<MERMAID_RELEASE_VERSION>+)`
+
+We know it can sometimes be hard to code _and_ write user documentation.
+
+Our documentation is managed in `packages/mermaid/src/docs`. Details on how to edit is in the [Contributing Documentation](#contributing-documentation) section.
+
+Create another issue specifically for the documentation.\
+You will need to help with the PR, but definitely ask for help if you feel stuck.
+When it feels hard to write stuff out, explaining it to someone and having that person ask you clarifying questions can often be 80% of the work!
+
+When in doubt, write up and submit what you can. It can be clarified and refined later. (With documentation, something is better than nothing!)
+
+## 4. Submit your pull request
+
+**\[TODO - PR titles should start with (fix | feat | ....)]**
+
+We make all changes via Pull Requests (PRs). As we have many Pull Requests from developers new to Mermaid, we have put in place a process wherein _knsv, Knut Sveidqvist_ is in charge of the final release process and the active maintainers are in charge of reviewing and merging most PRs.
+
+- PRs will be reviewed by active maintainers, who will provide feedback and request changes as needed.
+- The maintainers will request a review from knsv, if necessary.
+- Once the PR is approved, the maintainers will merge the PR into the `develop` branch.
+- When a release is ready, the `release/x.x.x` branch will be created, extensively tested and knsv will be in charge of the release process.
+
+**Reminder: Pull Requests should be submitted to the develop branch.**

docs/community/contributing.md

@@ -1,523 +0,0 @@
-> **Warning**
->
-> ## THIS IS AN AUTOGENERATED FILE. DO NOT EDIT.
->
-> ## Please edit the corresponding file in [/packages/mermaid/src/docs/community/contributing.md](../../packages/mermaid/src/docs/community/contributing.md).
-
-# Mermaid Contributing Guide
-
-You decided to take part in the development? Welcome!
-
-We are trying to make our guidelines for you as explicit and detailed as possible.
-
-## Initial Setup
-
-Initial setup consists of 3 main steps:
-
-```mermaid
-flowchart LR
-  source --> requirements --> setup
-
-  source[Get the Source Code]
-  requirements[Install the Requirements]
-  setup[Install Packages]
-```
-
-### Get the Source Code
-
-In GitHub, you first [**fork a mermaid repository**](https://github.com/mermaid-js/mermaid/fork) when you are going to make changes and submit pull requests.
-
-Then you **clone** a copy to your local development machine (e.g. where you code) to make a copy with all the files to work with.
-
-> **💡 Tip** > [Here is a GitHub document that gives an overview of the process](https://docs.github.com/en/get-started/quickstart/fork-a-repo).
-
-```bash
-git clone git@github.com/your-fork/mermaid
-```
-
-Once you have cloned the repository onto your development machine, change into the `mermaid` project folder (the top level directory of the mermaid project repository)
-
-```bash
-cd mermaid
-```
-
-### Install Requirements
-
-We support **development within Docker** environment along with **host setup**. You may choose it up to your preferences.
-
-**Host**
-
-These are the tools we use for working with the code and documentation:
-
-- [Node.js](https://nodejs.org/en/).
-- [pnpm](https://pnpm.io/) package manager.
-
-The following commands must be sufficient enough to start with:
-
-```bash
-curl -fsSL https://get.pnpm.io/install.sh | sh -
-pnpm env use --global 18
-```
-
-You may also need to reload `.shrc` or `.bashrc` afterwards.
-
-**Docker**
-
-[Install Docker](https://docs.docker.com/engine/install/). And that is pretty much all you need.
-
-Optionally, to run GUI (Cypress) within Docker you will also need an X11 server installed.
-You might already have it installed, so check this by running:
-
-```bash
-echo $DISPLAY
-```
-
-If the `$DISPLAY` variable is not empty, then an X11 server is running. Otherwise you may need to install one.
-
-### Install Packages
-
-**Host**
-
-Install packages:
-
-```bash
-pnpm install
-```
-
-**Docker**
-
-For development using Docker there is a self-documented `run` bash script, which provides convenient aliases for `docker compose` commands.
-
-Make sure that `./run` script is executable:
-
-```bash
-chmod +x run
-```
-
-> **💡 Tip**
-> To get detailed help simply type `./run` or `./run help`.
->
-> It also has short _Development quick start guide_ embedded.
-
-Then install packages:
-
-```bash
-./run pnpm install
-```
-
-### Verify Everything Works
-
-This step is optional, but it helps to make sure that everything in development branch was OK before you started making any changes.
-
-You can run the `test` script to verify that pnpm is working _and_ that the repository has been cloned correctly:
-
-**Host**
-
-```bash
-pnpm test
-```
-
-**Docker**
-
-```bash
-./run pnpm test
-```
-
-The `test` script and others are in the top-level `package.json` file.
-
-All tests should run successfully without any errors or failures.
-
-> **Note**
-> You might see _lint_ or _formatting_ warnings. Those are ok during this step.
-
-## Workflow
-
-Contributing process is very simple and straightforward:
-
-```mermaid
-  flowchart LR
-
-  branch --> changes --> submit
-  branch[Checkout a New Branch]
-  changes[Make Changes]
-  submit[Submit a PR]
-```
-
-Mermaid uses a [Git Flow](https://guides.github.com/introduction/flow/)–inspired approach to branching.
-
-Development is done in the `develop` branch.
-
-```mermaid
----
-config:
-  gitGraph:
-    mainBranchName: develop
----
-gitGraph LR:
-  commit
-  commit
-  branch "docs/2910_update-guidelines" order: 1
-  commit
-  commit
-  commit
-  checkout develop
-  merge "docs/2910_update-guidelines"
-  commit
-```
-
-To prepare a new version for release the maintainers create a `release/vX.X.X` branch from `develop` for testing. Once the release happens we add a tag to the `release` branch and merge it with `master`. The live product and on-line documentation are what is in the `master` branch.
-
-## Checkout a New Branch
-
-> **💡 Tip**
-> All new work should be based on the `develop` branch.
-
-Make sure you have the most up-to-date version of the `develop` branch.
-
-Check out the `develop` branch, then `fetch` or `pull` to update it:
-
-```bash
-git checkout develop
-git fetch # or `git pull`
-```
-
-Create a new branch for your work:
-
-```bash
-git checkout -b docs/2910_update-contributing-guidelines
-```
-
-We use the following naming convention for branches:
-
-```txt
-[feature | bug | chore | docs]/[issue number]_[short-description]
-```
-
-You can always check current [configuration of labelling and branch prefixes](https://github.com/mermaid-js/mermaid/blob/develop/.github/pr-labeler.yml)
-
-- The first part is the **type** of change: a `feature`, `bug`, `chore`, `docs`
-- followed by a **slash** (`/`),which helps to group like types together in many git tools
-- followed by the **issue number**, e.g. `2910`
-- followed by an **underscore** (`_`)
-- followed by a **short description** with dashes (`-`) or underscores (`_`) instead of spaces
-
-```mermaid
-flowchart LR
-  feature --> slash
-  bug --> slash
-  chore --> slash
-  docs --> slash
-  slash --> 2945 --> underscore
-  slash --> 1123 --> underscore
-  underscore --> short_description_1
-  underscore --> short_description_2
-
-  underscore["_"]
-  slash["/"]
-
-  short_description_1["state-diagram-new-arrow-florbs"]
-  short_description_2["fix_random_ugly_red_text"]
-```
-
-If your work is specific to a single diagram type, it is a good idea to put the diagram type at the start of the description. This will help us keep release notes organized by a diagram type.
-
-> **Note**
-> A new feature described in issue 2945 that adds a new arrow type called 'florbs' to state diagrams
->
-> `feature/2945_state-diagram-new-arrow-florbs`
-
-> **💡 Tip**
-> A bug described in issue 1123 that causes random ugly red text in multiple diagram types
->
-> `bug/1123_fix_random_ugly_red_text`
-
-## Contributing Code
-
-Code is the heart of every software project. We strive to make it better. Who if not us?
-
-### Where is the Code Located?
-
-The core of Mermaid is located under `packages/mermaid/src`.
-
-### Running Mermaid Locally
-
-**Host**
-
-```bash
-pnpm run dev
-```
-
-**Docker**
-
-```bash
-./run dev
-```
-
-After starting the dev server open <http://localhost:9000> in your browser.
-
-Now you are ready to make your changes!
-
-### Make Changes
-
-Have a look at <http://localhost:9000>. There is a list of demos that can be used to see and test your changes.
-
-If you need a specific diagram, you can duplicate the `example.html` file in `/demos/dev` and add your own mermaid code to your copy.
-
-That will be served at <http://localhost:9000/dev/your-file-name.html>.
-After making code changes, the dev server will rebuild the mermaid library and automatically reload the page.
-
-Edit files in `packages/mermaid/src` as required.
-
-### Write Tests
-
-Tests ensure that each function, module, or part of code does what it says it will do. This is critically important when other changes are made to ensure that existing code is not broken (no regression).
-
-Just as important, the tests act as _specifications:_ they specify what the code does (or should do).
-Whenever someone is new to a section of code, they should be able to read the tests to get a thorough understanding of what it does and why.
-
-If you are fixing a bug, you should add tests to ensure that your code has actually fixed the bug, to specify/describe what the code is doing, and to ensure the bug doesn't happen again.
-(If there had been a test for the situation, the bug never would have happened in the first place.)
-You may need to change existing tests if they were inaccurate.
-
-If you are adding a feature, you will definitely need to add tests. Depending on the size of your feature, you may need to add integration tests.
-
-#### Unit Tests
-
-Unit tests are tests that test a single function or module. They are the easiest to write and the fastest to run.
-
-Unit tests are mandatory for all code except the renderers. (The renderers are tested with integration tests.)
-
-We use [Vitest](https://vitest.dev) to run unit tests.
-
-**Host**
-
-You can use the following command to run the unit tests:
-
-```sh
-pnpm test
-```
-
-When writing new tests, it's easier to have the tests automatically run as you make changes. You can do this by running the following command:
-
-```sh
-pnpm test:watch
-```
-
-**Docker**
-
-When using Docker prepend your command with `./run`:
-
-```sh
-./run pnpm test
-```
-
-#### Integration / End-to-End (E2E) Tests
-
-These test the rendering and visual appearance of the diagrams.
-
-This ensures that the rendering of that feature in the E2E will be reviewed in the release process going forward. Less chance that it breaks!
-
-To start working with the E2E tests:
-
-**Host**
-
-- Run `pnpm dev` to start the dev server
-- Start **Cypress** by running `pnpm cypress:open`
-
-**Docker**
-
-- Enable local connections for x11 server `xhost +local:`
-- Run `./run pnpm dev` to start the dev server
-- Start **Cypress** by running `./run pnpm cypress:open --project .`
-
-The rendering tests are very straightforward to create. There is a function `imgSnapshotTest`, which takes a diagram in text form and the mermaid options, and it renders that diagram in Cypress.
-
-When running in CI it will take a snapshot of the rendered diagram and compare it with the snapshot from last build and flag it for review if it differs.
-
-This is what a rendering test looks like:
-
-```js
-it('should render forks and joins', () => {
-  imgSnapshotTest(
-    `
-    stateDiagram
-    state fork_state &lt;&lt;fork&gt;&gt;
-      [*] --> fork_state
-      fork_state --> State2
-      fork_state --> State3
-
-      state join_state &lt;&lt;join&gt;&gt;
-      State2 --> join_state
-      State3 --> join_state
-      join_state --> State4
-      State4 --> [*]
-    `,
-    { logLevel: 0 }
-  );
-});
-```
-
-<!-- **_[TODO - running the tests against what is expected in development. ]_** -->
-
-<!-- **_[TODO - how to generate new screenshots]_** -->
-
-### Update Documentation
-
-> **💡 Tip**
-> Our documentation is managed in `packages/mermaid/src/docs`. Details on how to edit is in the [documentation section](#contributing-documentation)
-
-If the users have no way to know that things have changed, then you haven't really _fixed_ anything for the users; you've just added to making Mermaid feel broken.
-Likewise, if users don't know that there is a new feature that you've implemented, it will forever remain unknown and unused.
-
-The documentation has to be updated for users to know that things have been changed and added!
-If you are adding a new feature, add `(v10.8.0+)` in the title or description. It will be replaced automatically with the current version number when the release happens.
-
-eg: `# Feature Name (v10.8.0+)`
-
-We know it can sometimes be hard to code _and_ write user documentation.
-
-Create another issue specifically for the documentation.
-You will need to help with the PR, but definitely ask for help if you feel stuck.
-When it feels hard to write stuff out, explaining it to someone and having that person ask you clarifying questions can often be 80% of the work!
-
-When in doubt, write up and submit what you can. It can be clarified and refined later. (With documentation, something is better than nothing!)
-
-## Contributing Documentation
-
-If it is not in the documentation, it's like it never happened. Wouldn't that be sad? With all the effort that was put into the feature?
-
-### Where is the Documentation Located?
-
-> **Warning**
-> DO NOT CHANGE FILES IN `/docs`
->
-> The `docs` folder will be automatically generated when committing to `packages/mermaid/src/docs` and **should not** be edited manually.
-
-Documentation is located in the [`packages/mermaid/src/docs`](https://github.com/mermaid-js/mermaid/tree/develop/packages/mermaid/src/docs) folder. Just pick the right section and start typing.
-
-The contents of [mermaid.js.org](https://mermaid.js.org/) are based on the docs from the `master` branch. Updates committed to the `master` branch are reflected in the [Mermaid Docs](https://mermaid.js.org/) once published.
-
-```mermaid-example
-flowchart LR
-  classDef default fill:#fff,color:black,stroke:black
-
-  source["Edit /packages/mermaid/src/docs"] -- automatic processing--> published["View /docs which will be published on Official Website"]
-```
-
-```mermaid
-flowchart LR
-  classDef default fill:#fff,color:black,stroke:black
-
-  source["Edit /packages/mermaid/src/docs"] -- automatic processing--> published["View /docs which will be published on Official Website"]
-```
-
-### Running the Documentation Website Locally
-
-**[The mermaid documentation site](https://mermaid.js.org/) is powered by [Vitepress](https://vitepress.vuejs.org/).**
-
-Start development server for the documentation site
-
-**Host**
-
-```bash
-pnpm --filter mermaid run docs:dev
-```
-
-or
-
-```bash
-cd packages/mermaid
-pnpm docs:dev
-```
-
-**Docker**
-
-```bash
-./run docs:dev
-```
-
-Open <http://localhost:3333/> in your browser.
-
-### Formatting
-
-The documentation is written in Markdown. To get acquainted with its syntax [see the GitHub Markdown help page](https://help.github.com/en/github/writing-on-github/basic-writing-and-formatting-syntax).
-
-You can use `note`, `tip`, `warning` and `danger` in triple backticks to add a note, tip, warning or danger box.
-
-> **‼️ Danger**
-> Do not use vitepress specific markdown syntax `::: warning` as it will not be processed correctly.
-
-Here are a few examples:
-
-````markdown
-```note
-This is a note
-```
-
-```tip
-This is a tip
-```
-
-```warning
-This is a warning
-```
-
-```danger
-This is a danger alert
-```
-````
-
-> **Note**
-> This is a note
-
-> **💡 Tip**
-> This is a tip
-
-> **Warning**
-> This is a warning
-
-> **‼️ Danger**
-> This is a danger alert
-
-### Navigation
-
-If you want to propose changes to how the documentation is _organized_, such as adding a new section or re-arranging or renaming a section, you must update the **sidebar navigation**, which is defined in [the vitepress config](../.vitepress/config.ts). The same goes to **topbar**.
-
-### Build Docs
-
-The content of `/docs` folder is built with Github Actions.
-
-> **Warning**
-> So as to allow automatic compilation of documentation pages you have to enable Github Actions on your fork first
-
-## Submit your pull request
-
-> **Note**
-> Do not forget to push your changes
->
-> ```bash
-> git push -u origin docs/2910_update-guidelines
-> ```
-
-We make all changes via Pull Requests (PRs). Open a new one.
-
-Right now we are not following any strict rules about naming PRs. Give it a representative title and short description. There is also a [pull request template](https://github.com/mermaid-js/mermaid/blob/develop/.github/pull_request_template.md) which will help you with it.
-
-In case in its description contains a [magic comment](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) your PR will be automatically attached to the issue:
-
-```markdown
-Resolves #<your issue ID here>
-```
-
-## Congratulations
-
-You have successfully submitted your improvements! What is next?
-
-- PRs will be reviewed by active maintainers, who will provide feedback and request changes as needed.
-- The maintainers will request a review from _knsv_, if necessary.
-- Once the PR is approved, the maintainers will merge the PR into the `develop` branch.
-- When a release is ready, the `release/x.x.x` branch will be created, extensively tested and knsv will be in charge of the release process.
-
-Thanks for you help!
-
-<!--- cspell:ignore florbs --->

docs/community/development.md

@@ -0,0 +1,96 @@
+> **Warning**
+>
+> ## THIS IS AN AUTOGENERATED FILE. DO NOT EDIT.
+>
+> ## Please edit the corresponding file in [/packages/mermaid/src/docs/community/development.md](../../packages/mermaid/src/docs/community/development.md).
+
+# Contributing to Mermaid
+
+> The following documentation describes how to work with Mermaid in your host environment.
+> There's also a [Docker installation guide](../community/docker-development.md)
+> if you prefer to work in a Docker environment.
+
+So you want to help? That's great!
+
+![Image of happy people jumping with excitement](https://media.giphy.com/media/BlVnrxJgTGsUw/giphy.gif)
+
+Here are a few things to get you started on the right path.
+
+## Get the Source Code
+
+In GitHub, you first **fork** a repository when you are going to make changes and submit pull requests.
+
+Then you **clone** a copy to your local development machine (e.g. where you code) to make a copy with all the files to work with.
+
+[Fork mermaid](https://github.com/mermaid-js/mermaid/fork) to start contributing to the main project and its documentation, or [search for other repositories](https://github.com/orgs/mermaid-js/repositories).
+
+[Here is a GitHub document that gives an overview of the process.](https://docs.github.com/en/get-started/quickstart/fork-a-repo)
+
+## Technical Requirements
+
+> The following documentation describes how to work with Mermaid in your host environment.
+> There's also a [Docker installation guide](../community/docker-development.md)
+> if you prefer to work in a Docker environment.
+
+These are the tools we use for working with the code and documentation:
+
+- [volta](https://volta.sh/) to manage node versions.
+- [Node.js](https://nodejs.org/en/). `volta install node`
+- [pnpm](https://pnpm.io/) package manager. `volta install pnpm`
+- [npx](https://docs.npmjs.com/cli/v8/commands/npx) the packaged executor in npm. This is needed [to install pnpm.](#install-packages)
+
+Follow the setup steps below to install them and start the development.
+
+## Setup and Launch
+
+### Switch to project
+
+Once you have cloned the repository onto your development machine, change into the `mermaid` project folder (the top level directory of the mermaid project repository)
+
+```bash
+cd mermaid
+```
+
+### Install packages
+
+Run `npx pnpm install`. You will need `npx` for this because volta doesn't support it yet.
+
+```bash
+npx pnpm install # npx is required for first install
+```
+
+### Launch
+
+```bash
+npx pnpm run dev
+```
+
+Now you are ready to make your changes! Edit whichever files in `src` as required.
+
+Open <http://localhost:9000> in your browser, after starting the dev server.
+There is a list of demos that can be used to see and test your changes.
+
+If you need a specific diagram, you can duplicate the `example.html` file in `/demos/dev` and add your own mermaid code to your copy.
+
+That will be served at <http://localhost:9000/dev/your-file-name.html>.
+After making code changes, the dev server will rebuild the mermaid library. You will need to reload the browser page yourself to see the changes. (PRs for auto reload are welcome!)
+
+## Verify Everything is Working
+
+You can run the `test` script to verify that pnpm is working _and_ that the repository has been cloned correctly:
+
+```bash
+pnpm test
+```
+
+The `test` script and others are in the top-level `package.json` file.
+
+All tests should run successfully without any errors or failures. (You might see _lint_ or _formatting_ warnings; those are ok during this step.)
+
+## Last Words
+
+Don't get daunted if it is hard in the beginning. We have a great community with only encouraging words. So, if you get stuck, ask for help and hints in the Slack forum. If you want to show off something good, show it off there.
+
+[Join our Slack community if you want closer contact!](https://join.slack.com/t/mermaid-talk/shared_invite/enQtNzc4NDIyNzk4OTAyLWVhYjQxOTI2OTg4YmE1ZmJkY2Y4MTU3ODliYmIwOTY3NDJlYjA0YjIyZTdkMDMyZTUwOGI0NjEzYmEwODcwOTE)
+
+![Image of superhero wishing you good luck](https://media.giphy.com/media/l49JHz7kJvl6MCj3G/giphy.gif)

docs/community/docker-development.md

@@ -0,0 +1,109 @@
+> **Warning**
+>
+> ## THIS IS AN AUTOGENERATED FILE. DO NOT EDIT.
+>
+> ## Please edit the corresponding file in [/packages/mermaid/src/docs/community/docker-development.md](../../packages/mermaid/src/docs/community/docker-development.md).
+
+# Contributing to Mermaid via Docker
+
+> The following documentation describes how to work with Mermaid in a Docker environment.
+> There's also a [host installation guide](../community/development.md)
+> if you prefer to work without a Docker environment.
+
+So you want to help? That's great!
+
+![Image of happy people jumping with excitement](https://media.giphy.com/media/BlVnrxJgTGsUw/giphy.gif)
+
+Here are a few things to get you started on the right path.
+
+## Get the Source Code
+
+In GitHub, you first **fork** a repository when you are going to make changes and submit pull requests.
+
+Then you **clone** a copy to your local development machine (e.g. where you code) to make a copy with all the files to work with.
+
+[Fork mermaid](https://github.com/mermaid-js/mermaid/fork) to start contributing to the main project and its documentation, or [search for other repositories](https://github.com/orgs/mermaid-js/repositories).
+
+[Here is a GitHub document that gives an overview of the process.](https://docs.github.com/en/get-started/quickstart/fork-a-repo)
+
+## Technical Requirements
+
+> The following documentation describes how to work with Mermaid in a Docker environment.
+> There's also a [host installation guide](../community/development.md)
+> if you prefer to work without a Docker environment.
+
+[Install Docker](https://docs.docker.com/engine/install/). And that is pretty much all you need.
+
+Optionally, to run GUI (Cypress) within Docker you will also need an X11 server installed.
+You might already have it installed, so check this by running:
+
+```bash
+echo $DISPLAY
+```
+
+If the `$DISPLAY` variable is not empty, then an X11 server is running. Otherwise you may need to install one.
+
+## Setup and Launch
+
+### Switch to project
+
+Once you have cloned the repository onto your development machine, change into the `mermaid` project folder (the top level directory of the mermaid project repository)
+
+```bash
+cd mermaid
+```
+
+### Make `./run` executable
+
+For development using Docker there is a self-documented `run` bash script, which provides convenient aliases for `docker compose` commands.
+
+Ensure `./run` script is executable:
+
+```bash
+chmod +x run
+```
+
+> **💡 Tip**
+> To get detailed help simply type `./run` or `./run help`.
+>
+> It also has short _Development quick start guide_ embedded.
+
+### Install packages
+
+```bash
+./run pnpm install  # Install packages
+```
+
+### Launch
+
+```bash
+./run dev
+```
+
+Now you are ready to make your changes! Edit whichever files in `src` as required.
+
+Open <http://localhost:9000> in your browser, after starting the dev server.
+There is a list of demos that can be used to see and test your changes.
+
+If you need a specific diagram, you can duplicate the `example.html` file in `/demos/dev` and add your own mermaid code to your copy.
+
+That will be served at <http://localhost:9000/dev/your-file-name.html>.
+After making code changes, the dev server will rebuild the mermaid library. You will need to reload the browser page yourself to see the changes. (PRs for auto reload are welcome!)
+
+## Verify Everything is Working
+
+```bash
+./run pnpm test
+```
+
+The `test` script and others are in the top-level `package.json` file.
+
+All tests should run successfully without any errors or failures. (You might see _lint_ or _formatting_ warnings; those are ok during this step.)
+
+## Last Words
+
+Don't get daunted if it is hard in the beginning. We have a great community with only encouraging words. So, if you get stuck, ask for help and hints in the Slack forum. If you want to show off something good, show it off there.
+
+[Join our Slack community if you want closer contact!](https://join.slack.com/t/mermaid-talk/shared_invite/enQtNzc4NDIyNzk4OTAyLWVhYjQxOTI2OTg4YmE1ZmJkY2Y4MTU3ODliYmIwOTY3NDJlYjA0YjIyZTdkMDMyZTUwOGI0NjEzYmEwODcwOTE)
+
+![Image of superhero wishing you good luck](https://media.giphy.com/media/l49JHz7kJvl6MCj3G/giphy.gif)

docs/community/documentation.md

@@ -0,0 +1,105 @@
+> **Warning**
+>
+> ## THIS IS AN AUTOGENERATED FILE. DO NOT EDIT.
+>
+> ## Please edit the corresponding file in [/packages/mermaid/src/docs/community/documentation.md](../../packages/mermaid/src/docs/community/documentation.md).
+
+# Contributing Documentation
+
+**_\[TODO: This section is still a WIP. It still needs MAJOR revision.]_**
+
+If it is not in the documentation, it's like it never happened. Wouldn't that be sad? With all the effort that was put into the feature?
+
+The docs are located in the `packages/mermaid/src/docs` folder and are written in Markdown. Just pick the right section and start typing.
+
+The contents of [mermaid.js.org](https://mermaid.js.org/) are based on the docs from the `master` branch.
+Updates committed to the `master` branch are reflected in the [Mermaid Docs](https://mermaid.js.org/) once published.
+
+## How to Contribute to Documentation
+
+We are a little less strict here, it is OK to commit directly in the `develop` branch if you are a collaborator.
+
+The documentation is located in the `packages/mermaid/src/docs` directory and organized according to relevant subfolder.
+
+The `docs` folder will be automatically generated when committing to `packages/mermaid/src/docs` and **should not** be edited manually.
+
+```mermaid-example
+flowchart LR
+  classDef default fill:#fff,color:black,stroke:black
+
+  source["files in /packages/mermaid/src/docs\n(changes should be done here)"] -- automatic processing\nto generate the final documentation--> published["files in /docs\ndisplayed on the official documentation site"]
+
+```
+
+```mermaid
+flowchart LR
+  classDef default fill:#fff,color:black,stroke:black
+
+  source["files in /packages/mermaid/src/docs\n(changes should be done here)"] -- automatic processing\nto generate the final documentation--> published["files in /docs\ndisplayed on the official documentation site"]
+
+```
+
+You can use `note`, `tip`, `warning` and `danger` in triple backticks to add a note, tip, warning or danger box.
+Do not use vitepress specific markdown syntax `::: warning` as it will not be processed correctly.
+
+````markdown
+```note
+Note content
+```
+
+```tip
+Tip content
+```
+
+```warning
+Warning content
+```
+
+```danger
+Danger content
+```
+````
+
+> **Note**
+> If the change is _only_ to the documentation, you can get your changes published to the site quicker by making a PR to the `master` branch. In that case, your branch should be based on master, not develop.
+
+We encourage contributions to the documentation at [packages/mermaid/src/docs in the _develop_ branch](https://github.com/mermaid-js/mermaid/tree/develop/packages/mermaid/src/docs).
+
+**_DO NOT CHANGE FILES IN `/docs`_**
+
+## The official documentation site
+
+**[The mermaid documentation site](https://mermaid.js.org/) is powered by [Vitepress](https://vitepress.vuejs.org/).**
+
+To run the documentation site locally:
+
+1.  Run `pnpm --filter mermaid run docs:dev` to start the dev server. (Or `pnpm docs:dev` inside the `packages/mermaid` directory.)
+2.  Open <http://localhost:3333/> in your browser.
+
+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).
+
+To edit Docs on your computer:
+
+_\[TODO: need to keep this in sync with [check out a git branch in Contributing Code above](#1-checkout-a-git-branch) ]_
+
+1.  Create a fork of the develop branch to work on.
+2.  Find the Markdown file (.md) to edit in the `packages/mermaid/src/docs` directory.
+3.  Make changes or add new documentation.
+4.  Commit changes to your branch and push it to GitHub (which should create a new branch).
+5.  Create a Pull Request from the branch of your fork.
+
+To edit Docs on GitHub:
+
+1.  Login to [GitHub.com](https://www.github.com).
+2.  Navigate to [packages/mermaid/src/docs](https://github.com/mermaid-js/mermaid/tree/develop/packages/mermaid/src/docs) in the mermaid-js repository.
+3.  To edit a file, click the pencil icon at the top-right of the file contents panel.
+4.  Describe what you changed in the **Propose file change** section, located at the bottom of the page.
+5.  Submit your changes by clicking the button **Propose file change** at the bottom (by automatic creation of a fork and a new branch).
+6.  Visit the Actions tab in Github, `https://github.com/<Your Username>/mermaid/actions` and enable the actions for your fork. This will ensure that the documentation is built and updated in your fork.
+7.  Create a Pull Request of your newly forked branch by clicking the green **Create Pull Request** button.
+
+## Documentation organization: Sidebar navigation
+
+If you want to propose changes to how the documentation is _organized_, such as adding a new section or re-arranging or renaming a section, you must update the **sidebar navigation.**
+
+The sidebar navigation is defined in [the vitepress configuration file config.ts](../.vitepress/config.ts).

docs/community/intro.md

@@ -1,60 +0,0 @@
-> **Warning**
->
-> ## THIS IS AN AUTOGENERATED FILE. DO NOT EDIT.
->
-> ## Please edit the corresponding file in [/packages/mermaid/src/docs/community/intro.md](../../packages/mermaid/src/docs/community/intro.md).
-
-# Getting Started
-
-So you want to help? That's great!
-
-![Image of happy people jumping with excitement](https://media.giphy.com/media/BlVnrxJgTGsUw/giphy.gif)
-
-Here are a few things to get you started on the right path.
-
-## How can I help?
-
-```mermaid
-mindmap
-  root)Contributing(
-    Development
-      Solving issues
-      Adding new diagrams
-      Handling pull requests
-      Updating tooling
-    Testing
-      Verification of fixed issues
-      Regression testing in connection with releases
-      Testing pull requests
-    Management
-      Coordinating the work
-      Classification and monitoring of incoming issues
-```
-
-## Join the Development
-
-> **💡 Tip** > **Check out our** [**detailed contribution guide**](./contributing.md).
-
-Where to start:
-
-- You could start getting some knowledge of the code base by working on [these "good first issues"](https://github.com/mermaid-js/mermaid/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3A%22Good+first+issue%21%22+).
-- You could jump right in and help us fix any of [these bugs](https://github.com/mermaid-js/mermaid/issues?q=is%3Aissue+is%3Aopen+label%3A%22Type%3A+Bug+%2F+Error%22++label%3A%22Contributor+needed%22+)!
-- You could help write and [improve the documentation](https://github.com/mermaid-js/mermaid/issues?q=is%3Aissue+is%3Aopen+label%3A%22Area%3A+Documentation%22).
-- You could work on a new feature! [These](https://github.com/mermaid-js/mermaid/issues?q=is%3Aissue+is%3Aopen+label%3A%22Area%3A+Development%22+label%3A%22Type%3A+Enhancement%22+label%3A%22Status%3A+Approved%22+) are some ideas!
-- You could confirm the bugs in [these issues](https://github.com/mermaid-js/mermaid/issues?q=is%3Aissue+is%3Aopen+label%3A%22Status%3A+Triage%22++label%3A%22Type%3A+Bug+%2F+Error%22).
-
-[You can join our Discord server if you want closer contact!](https://discord.gg/AgrbSrBer3)
-
-## A Question Or a Suggestion?
-
-> **💡 Tip** > **Have a look at** [**how to open an issue**](./questions-and-suggestions.md).
-
-If you have faced a vulnerability [report it to us](./security.md).
-
-## Last Words
-
-Don't get daunted if it is hard in the beginning. We have a great community with only encouraging words. So, if you get stuck, ask for help and hints in the Slack forum. If you want to show off something good, show it off there.
-
-[You can join our Discord server if you want closer contact!](https://discord.gg/AgrbSrBer3)
-
-![Image of superhero wishing you good luck](https://media.giphy.com/media/l49JHz7kJvl6MCj3G/giphy.gif)

docs/community/newDiagram.md

@@ -2,7 +2,7 @@
 >
 > ## THIS IS AN AUTOGENERATED FILE. DO NOT EDIT.
 >
-> ## Please edit the corresponding file in [/packages/mermaid/src/docs/community/new-diagram.md](../../packages/mermaid/src/docs/community/new-diagram.md).
+> ## Please edit the corresponding file in [/packages/mermaid/src/docs/community/newDiagram.md](../../packages/mermaid/src/docs/community/newDiagram.md).
 
 # Adding a New Diagram/Chart 📊