Merge branch 'develop' into sidv/fixErrorDiagram

2024-06-16 20:09:53 +05:30
parent e530b3e35f 71f4a9bac7
commit cc2b574a6f
55 changed files with 3238 additions and 2003 deletions
@@ -3,3 +3,12 @@
 **/.svelte-kit
 **/dist
 **/docs
+
+**/.github
+**/.husky
+**/.vscode
+
+Dockerfile
+.dockerignore
+docker-compose.yml
+README.md
@@ -0,0 +1,2 @@
+  MERMAID_DOMAIN="mermaid.live"
+	MERMAID_ANALYTICS_URL="https://p.mermaid.live"
@@ -7,17 +7,11 @@ module.exports = {
    // 'plugin:@typescript-eslint/recommended-requiring-type-checking',
    'plugin:@typescript-eslint/strict',
    'plugin:unicorn/recommended',
+    'plugin:svelte/recommended',
+    'plugin:svelte/prettier',
    'prettier'
  ],
-  plugins: [
-    'svelte3',
-    'tailwindcss',
-    '@typescript-eslint',
-    'es',
-    'vitest',
-    'no-only-tests',
-    'unicorn'
-  ],
+  plugins: ['tailwindcss', '@typescript-eslint', 'es', 'vitest', 'no-only-tests', 'unicorn'],
  ignorePatterns: [
    'docs/*',
    '*.cjs',
@@ -30,7 +24,13 @@ module.exports = {
    'tsconfig.json'
  ],
  overrides: [
-    { files: ['*.svelte'], processor: 'svelte3/svelte3' },
+    {
+      files: ['*.svelte'],
+      parser: 'svelte-eslint-parser',
+      parserOptions: {
+        parser: '@typescript-eslint/parser'
+      }
+    },
    {
      files: ['*.ts'],
      extends: [
@@ -42,16 +42,12 @@ module.exports = {
      ]
    }
  ],
-  settings: {
-    'svelte3/typescript': () => require('typescript')
-  },
  parserOptions: {
    sourceType: 'module',
    ecmaVersion: 2020,
    tsconfigRootDir: __dirname,
-    project: ['./tsconfig.json'],
-    extraFileExtensions: ['.svelte'],
-    allowAutomaticSingleRunInference: true
+    project: './tsconfig.json',
+    extraFileExtensions: ['.svelte']
  },
  env: {
    browser: true,
@@ -76,6 +72,7 @@ module.exports = {
        case: 'camelCase'
      }
    ],
+    'unicorn/filename-case': 'off',
    'unicorn/prevent-abbreviations': [
      'error',
      {
@@ -12,6 +12,6 @@ Describe the way your implementation works or what design decisions you made if

 Make sure you

- [ ] :book: have read the [contribution guidelines](https://github.com/mermaid-js/mermaid/blob/master/CONTRIBUTING.md)
+- [ ] :book: have read the [contribution guidelines](https://mermaid.js.org/community/contributing.html)
 - [ ] :computer: have added unit/e2e tests (if appropriate)
 - [ ] :bookmark: targeted `develop` branch
@@ -20,6 +20,9 @@ jobs:
          cache: yarn

      - name: Build & Deploy
+        env:
+          MERMAID_DOMAIN: 'mermaid.live'
+          MERMAID_ANALYTICS_URL: 'https://p.mermaid.live'
        run: |
          export DEPLOY=true
          [ "$GITHUB_EVENT_NAME" != "pull_request" ] && rm -rf docs/_app/
@@ -2,13 +2,11 @@ name: Docker

 on:
  push:
-    # Publish `master` as Docker `latest` image.
    branches:
+      # Publish `master` as Docker `latest` image.
      - master
-
-    # Publish `v1.2.3` tags as releases.
-    tags:
-      - v*
+      # Publish `develop` as Docker `nightly` image.
+      - develop

  # Run tests for all PRs to master and develop.
  pull_request:
@@ -16,54 +14,35 @@ on:
      - master
      - develop

-env:
-  IMAGE_NAME: mermaid-live-editor
-
 jobs:
-  test:
+  docker:
    runs-on: ubuntu-latest
-
    steps:
-      - uses: actions/checkout@v3
-
-      - name: Run tests
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
+      - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Get release version
        run: |
-          docker build . --file Dockerfile
-
-  push:
-    # Ensure test job passes before pushing image.
-    needs: test
-
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push'
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build image
-        run: docker build . --file Dockerfile --tag $IMAGE_NAME
-
-      - name: Log into registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
-      - name: Push image
-        run: |
-          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
-
-          # Change all uppercase to lowercase
-          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-
-          # Strip git ref prefix from version
-          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-
-          # Strip "v" prefix from tag name
-          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-
-          # Use Docker `latest` tag convention
-          [ "$VERSION" == "master" ] && VERSION=latest
-
-          echo IMAGE_ID=$IMAGE_ID
-          echo VERSION=$VERSION
-
-          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:$VERSION
+          RELEASE_VERSION=$([ "${{ github.ref_name }}" = "master" ] && echo "latest" || echo "nightly")
+          echo "RELEASE_VERSION=${RELEASE_VERSION}" >> "${GITHUB_ENV}"
+      - uses: docker/metadata-action@v5
+        id: meta
+        with:
+          images: ghcr.io/${{ github.repository }}
+          tags: |
+            type=raw,value=${{ env.RELEASE_VERSION }}
+      - uses: docker/build-push-action@v5
+        with:
+          context: .
+          target: mermaid
+          push: ${{ github.event_name == 'push' }}
+          pull: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
@@ -1,20 +0,0 @@
-name: Mark stale issues and pull requests
-
-on:
-  schedule:
-    - cron: '0 0 * * 4'
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v8
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          exempt-issue-labels: 'retained'
-          exempt-pr-labels: 'retained'
-          stale-issue-message: 'This issue is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 30 days'
-          stale-pr-message: 'This pr is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 30 days'
-          days-before-stale: 90
-          days-before-close: 30
-          days-before-pr-close: -1
@@ -0,0 +1 @@
+20.14.0
@@ -3,5 +3,7 @@
  "svelteSortOrder": "options-scripts-markup-styles",
  "bracketSameLine": true,
  "trailingComma": "none",
-  "printWidth": 100
+  "printWidth": 100,
+  "tailwindConfig": "./tailwind.config.cjs",
+  "plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"]
 }
@@ -9,11 +9,17 @@
    "cssnano",
    "daisyui",
    "esserializer",
+    "gantt",
+    "gitgraph",
    "KROKI",
    "localstorage",
    "mermaidchart",
    "mindmap",
+    "Pageview",
    "pako",
+    "panzoom",
+    "pzoom",
+    "roughjs",
    "Serde",
    "serdes",
    "tailwindcss",
@@ -1,17 +1,33 @@
-# Two-stage  docker container for mermaid-js/mermaid-live-editor
-# Build              : docker build -t mermaid-js/mermaid-live-editor .
-# Run                : docker run --name mermaid-live-editor --publish 8080:8080 mermaid-js/mermaid-live-editor
-# Start              : docker start mermaid-live-editor
-# Use webbrowser     : http://localhost:8080
-# Stop               : press ctrl + c 
-#                                     or 
-#                                        docker stop mermaid-live-editor
-FROM node:18.17.1 as mermaid-live-editor-builder 
-COPY --chown=node:node . /home
-WORKDIR /home
+FROM docker.io/library/node:20-alpine3.18 AS mermaid-live-editor-dependencies
+
+RUN apk --no-cache add build-base git python3 && \
+    rm -rf /var/cache/apk/*
+
+RUN yarn global add node-gyp
+
+WORKDIR /app
+
+COPY ./package.json .
+COPY ./yarn.lock .
+
 RUN yarn install
+
+FROM mermaid-live-editor-dependencies AS mermaid-live-editor-builder
+
+ARG MERMAID_RENDERER_URL
+ARG MERMAID_KROKI_RENDERER_URL
+ARG MERMAID_ANALYTICS_URL
+ARG MERMAID_DOMAIN
+
+COPY . ./
+
 RUN yarn build

-FROM nginxinc/nginx-unprivileged:alpine as mermaid-live-editor-runner
+FROM mermaid-live-editor-builder AS mermaid-dev
+
+ENTRYPOINT ["yarn", "dev"]
+
+FROM nginx:1.25-alpine3.18 AS mermaid
+
 COPY ./nginx.conf /etc/nginx/conf.d/default.conf
-COPY --from=mermaid-live-editor-builder --chown=nginx:nginx /home/docs /usr/share/nginx/html
+COPY --from=mermaid-live-editor-builder /app/docs /usr/share/nginx/html
@@ -1,8 +0,0 @@
-FROM node:18.17.1
-WORKDIR /app
-COPY package.json .
-COPY yarn.lock .
-RUN npm install
-COPY . .
-RUN ls
-CMD ["yarn", "dev"]
@@ -29,14 +29,20 @@ docker run --platform linux/amd64 --publish 8000:8080 ghcr.io/mermaid-js/mermaid

 ### To configure renderer URL

-When building, Set the Environment variable MERMAID_RENDERER_URL to the rendering service.
+When building set the MERMAID_RENDERER_URL build argument to the rendering service.
 Default is `https://mermaid.ink`

 ### To configure Kroki Instance URL

-When building, Set the Environment variable MERMAID_KROKI_RENDERER_URL to your Kroki instance.
+When building set the MERMAID_KROKI_RENDERER_URL build argument to your Kroki instance.
 Default is `https://kroki.io`

+### To configure Analytics
+
+When building set the MERMAID_ANALYTICS_URL build argument to your plausible instance, and MERMAID_DOMAIN to your domain.
+
+Default is empty, disabling analytics.
+
 ### Development

 ```bash
@@ -45,6 +51,28 @@ docker compose up --build

 Then open http://localhost:3000

+### Building and running images locally
+
+#### Build
+
+```bash
+docker build -t mermaid-js/mermaid-live-editor .
+```
+
+#### Run
+
+```bash
+docker run --detach --name mermaid-live-editor --publish 8080:8080 mermaid-js/mermaid-live-editor
+```
+
+Visit: <http://localhost:8080>
+
+#### Stop
+
+```bash
+docker stop mermaid-live-editor
+```
+
 ## Setup

 Below link will help you making a copy of the repository in your local system.
@@ -1,6 +1,6 @@
 import { defineConfig } from 'cypress';
 import fs from 'fs';
-import { isFileExist, findFiles } from 'cy-verify-downloads';
+import path from 'path';
 export default defineConfig({
  projectId: '2ckppp',
  viewportWidth: 1440,
@@ -15,17 +15,19 @@ export default defineConfig({
  e2e: {
    setupNodeEvents(on, config) {
      on('task', {
-        isFileExist,
-        findFiles,
-        deleteFile(path) {
-          fs.rmSync(path);
-          return null;
-        },
-        readFileMaybe(filename) {
-          if (fs.existsSync(filename)) {
-            return fs.readFileSync(filename, 'utf8');
+        readAndDeleteFile({ fileNamePattern, folder, mode }) {
+          const fileNameRegex = new RegExp(fileNamePattern);
+          const files = fs.readdirSync(folder);
+          const filename = files.find((file) => file.match(fileNameRegex));
+          const filePath = path.join(folder, filename);
+          try {
+            if (mode === 'size') {
+              return fs.statSync(filePath).size;
+            }
+            return fs.readFileSync(filePath, 'utf8');
+          } finally {
+            fs.rmSync(filePath);
          }
-          return null;
        }
      });
    },
@@ -26,8 +26,6 @@ describe('Check actions', () => {
  });

  it('should download png and svg', () => {
-    cy.clock(new Date(2022, 0, 1).getTime());
-
    cy.get(`#downloadPNG`).click();
    verifyFileSizeGreaterThan('diagram', 'png', 34_000);

@@ -43,7 +41,5 @@ describe('Check actions', () => {

    cy.get(`#downloadSVG`).click();
    verifyFileSizeGreaterThan('diagram', 'svg', 11_000);
-
-    cy.clock().invoke('restore');
  });
 });
@@ -50,8 +50,26 @@ describe('Auto sync tests', () => {
    cy.getLocalStorage('codeStore').snapshot();
  });

+  it('should automatically defer rendering when complex diagrams are edited', () => {
+    cy.get('#view').should('not.have.class', 'outOfSync');
+    typeInEditor(`
+A & B & C & D & E --> F & G & K & Z & i
+A & B & C & D & E --> F & G & K & Z & i
+A & B & C & D & E --> F & G & K & Z & i
+A & B & C & D & E --> F & G & K & Z & i
+A & B & C & D & E --> F & G & K & Z & i
+A & B & C & D & E --> F & G & K & Z & i
+A & B & C & D & E --> F & G & K & Z & i
+A & B & C & D & E --> F & G & K & Z & i
+A & B & C & D & E --> F & G & K & Z & i`);
+    cy.get('#view').should('have.class', 'outOfSync');
+    cy.get('#errorContainer').should('contain.text', 'It will be updated automatically.');
+    // The class should be removed automatically after 1 second.
+    cy.get('#view').should('not.have.class', 'outOfSync');
+  });
+
  it('supports commenting code out/in', () => {
-    cy.get('#editor').contains('Car').click();
+    cy.get('#editor').contains('Car').click({ force: true });
    cy.get('#editor').get('textarea').type(`${cmd}/`, { force: true });
    cy.get('#view').contains('Car').should('not.exist');

@@ -9,28 +9,28 @@ describe('Editor docs tests', () => {
  });

  it('Test default loading', () => {
-    cy.get(`[data-cy=docs][href^="https://mermaid-js.github.io/mermaid"]`).should('exist');
+    cy.get(`[data-cy=docs][href^="https://mermaid.js.org/"]`).should('exist');
  });

  it('Test to see if the correct URL loads when changing from one diagram to other', () => {
    cy.contains('Flow').click();
-    cy.get(`[data-cy=docs][href$="/#/flowchart"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/syntax/flowchart.html"]`).should('exist');

    cy.contains('Config').click();
-    cy.get(`[data-cy=docs][href$="/#/flowchart?id=configuration"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/syntax/flowchart.html#configuration"]`).should('exist');

    cy.contains('Sequence').click();
-    cy.get(`[data-cy=docs][href$="/#/sequenceDiagram?id=configuration"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/syntax/sequenceDiagram.html#configuration"]`).should('exist');

    cy.contains('Code').click();
-    cy.get(`[data-cy=docs][href$="/#/sequenceDiagram"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/syntax/sequenceDiagram.html"]`).should('exist');
  });

  it("Test to check URLs for a case where config URL doesn't exist", () => {
    cy.contains('State').click();
-    cy.get(`[data-cy=docs][href$="/#/stateDiagram"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/syntax/stateDiagram.html"]`).should('exist');

    cy.contains('Config').click();
-    cy.get(`[data-cy=docs][href$="/#/stateDiagram"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/syntax/stateDiagram.html"]`).should('exist');
  });
 });
@@ -11,7 +11,7 @@ export const typeInEditor = (
 ) => {
  cy.window().should('have.property', 'editorLoaded', true);
  cy.get('#editor').click();
-  cy.get('#editor').within(($editor) => {
+  cy.get('#editor').within(() => {
    if (bottom) {
      cy.get('textarea').type('{pageDown}', { force: true });
    }
@@ -29,17 +29,15 @@ export const verifyFileSizeGreaterThan = (
  extension: string,
  size: number
 ) => {
-  const fileName = `mermaid-${fileType}-2022-01-01-000000.${extension}`;
-  const filePath = `${downloadsFolder}/${fileName}`;
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-  cy.verifyDownload(fileName);
-  cy.readFile(filePath, null, {
-    log: false
-  }).then((buffer: ArrayBuffer) => {
-    expect(buffer.byteLength).to.be.gt(size);
-    expect(buffer.byteLength).to.be.lt(size * 1.3);
+  cy.get('#view').should('not.have.class', 'outOfSync');
+  cy.task('readAndDeleteFile', {
+    folder: downloadsFolder,
+    fileNamePattern: `^mermaid-${fileType}-.*.${extension}$`,
+    mode: 'size'
+  }).then((fileSize: number) => {
+    expect(fileSize).to.be.gt(size);
+    expect(fileSize).to.be.lt(size * 1.3);
  });
-  cy.task('deleteFile', filePath);
 };

 export const verifyFileSnapshot = (
@@ -47,14 +45,11 @@ export const verifyFileSnapshot = (
  extension: string,
  content: string
 ) => {
-  const fileName = `mermaid-${fileType}-2022-01-01-000000.${extension}`;
-  const filePath = `${downloadsFolder}/${fileName}`;
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-  cy.verifyDownload(fileName);
-  cy.readFile(filePath, null, {
-    log: false
-  }).then((buffer: ArrayBuffer) =>
-    expect(new TextDecoder('utf8').decode(buffer)).to.contain(content)
-  );
-  cy.task('deleteFile', filePath);
+  cy.task('readAndDeleteFile', {
+    folder: downloadsFolder,
+    fileNamePattern: `^mermaid-${fileType}-.*.${extension}$`,
+    mode: 'content'
+  }).then((fileContent: number) => {
+    expect(fileContent).to.contain(content);
+  });
 };
@@ -15,7 +15,6 @@

 // Import commands.js using ES2015 syntax:
 import './commands';
-require('cy-verify-downloads').addCustomCommand();

 // Alternatively you can use CommonJS syntax:
 // require('./commands')
@@ -1,7 +1,7 @@
 {
  "compilerOptions": {
    "allowJs": true,
-    "types": ["cypress", "cypress-localstorage-commands", "cy-verify-downloads", "node"]
+    "types": ["cypress", "cypress-localstorage-commands", "node"]
  },
  "include": ["**/*.ts"]
 }
@@ -3,7 +3,7 @@ services:
  mermaid:
    build:
      context: .
-      dockerfile: Dockerfile.dev
+      target: mermaid-dev
    volumes:
      - ./src:/app/src
    ports:
@@ -0,0 +1,3 @@
+[build.environment]
+	MERMAID_ANALYTICS_URL = 'https://p.mermaid.live'
+	MERMAID_DOMAIN = 'mermaid.live'
@@ -9,9 +9,9 @@
    "dev:test": "yarn dev",
    "build": "vite build",
    "preview": "vite preview",
-    "lint": "prettier --check --cache --plugin-search-dir=. .;eslint --ignore-path .gitignore .",
-    "lint:fix": "prettier --write --cache --plugin-search-dir=. .;eslint --fix --ignore-path .gitignore .",
-    "format": "prettier --write --cache --plugin-search-dir=. .",
+    "lint": "prettier --check --cache . && eslint --ignore-path .gitignore .",
+    "lint:fix": "prettier --write --cache . && eslint --fix --ignore-path .gitignore .",
+    "format": "prettier --write --cache .",
    "pre-commit": "lint-staged",
    "postinstall": "husky install && svelte-kit sync && (git config blame.ignoreRevsFile .git-blame-ignore-revs || true)",
    "test:unit": "vitest",
@@ -23,61 +23,65 @@
  },
  "devDependencies": {
    "@cypress/snapshot": "2.1.7",
-    "@sveltejs/adapter-static": "2.0.3",
-    "@sveltejs/kit": "1.25.0",
-    "@testing-library/jest-dom": "5.17.0",
-    "@testing-library/svelte": "3.2.2",
-    "@types/pako": "2.0.0",
-    "@types/uuid": "9.0.4",
-    "@typescript-eslint/eslint-plugin": "5.62.0",
-    "@typescript-eslint/parser": "5.62.0",
-    "@vitest/ui": "^0.34.0",
+    "@fortawesome/fontawesome-free": "^6.5.1",
+    "@sveltejs/adapter-static": "3.0.2",
+    "@sveltejs/kit": "2.5.16",
+    "@sveltejs/vite-plugin-svelte": "^3.0.1",
+    "@testing-library/svelte": "4.2.3",
+    "@types/lodash-es": "^4.17.12",
+    "@types/pako": "2.0.3",
+    "@types/uuid": "9.0.8",
+    "@typescript-eslint/eslint-plugin": "6.21.0",
+    "@typescript-eslint/parser": "6.21.0",
+    "@vitest/ui": "^1.1.3",
    "autoprefixer": "^10.4.14",
    "c8": "7.14.0",
    "chai": "^4.3.7",
    "cssnano": "^6.0.0",
-    "cy-verify-downloads": "0.2.0",
    "cypress": "12.17.4",
-    "cypress-localstorage-commands": "2.2.4",
-    "eslint": "8.49.0",
-    "eslint-config-prettier": "8.10.0",
-    "eslint-plugin-cypress": "2.14.0",
-    "eslint-plugin-es": "4.1.0",
+    "cypress-localstorage-commands": "2.2.6",
+    "eslint": "8.57.0",
+    "eslint-config-prettier": "9.1.0",
+    "eslint-plugin-cypress": "2.15.2",
+    "eslint-plugin-es": "^4.1.0",
    "eslint-plugin-no-only-tests": "^3.1.0",
-    "eslint-plugin-postcss-modules": "2.0.0",
-    "eslint-plugin-svelte3": "4.0.0",
-    "eslint-plugin-tailwindcss": "3.13.0",
-    "eslint-plugin-unicorn": "^46.0.0",
-    "eslint-plugin-vitest": "^0.3.0",
-    "esserializer": "1.3.11",
-    "font-awesome": "^4.7.0",
+    "eslint-plugin-postcss-modules": "^2.0.0",
+    "eslint-plugin-svelte": "^2.35.1",
+    "eslint-plugin-tailwindcss": "^3.13.1",
+    "eslint-plugin-unicorn": "^50.0.1",
+    "eslint-plugin-vitest": "^0.5.0",
+    "esserializer": "^1.3.11",
    "husky": "^8.0.3",
-    "jsdom": "21.1.2",
-    "lint-staged": "13.3.0",
+    "jsdom": "^21.1.2",
+    "lint-staged": "^15.2.0",
    "node-html-parser": "^6.1.5",
-    "postcss": "^8.4.21",
-    "postcss-load-config": "4.0.1",
-    "prettier": "2.8.8",
-    "prettier-plugin-svelte": "^2.10.0",
-    "svelte": "3.59.2",
-    "svelte-preprocess": "5.0.4",
-    "tailwindcss": "^3.3.1",
-    "tslib": "^2.5.0",
-    "typescript": "5.2.2",
-    "vite": "^4.3.9",
-    "vitest": "^0.34.0"
+    "postcss": "^8.4.33",
+    "postcss-load-config": "5.1.0",
+    "prettier": "^3.1.0",
+    "prettier-plugin-svelte": "^3.1.2",
+    "prettier-plugin-tailwindcss": "^0.6.0",
+    "svelte": "^4.2.8",
+    "svelte-preprocess": "^5.1.3",
+    "tailwindcss": "^3.4.1",
+    "tslib": "^2.6.2",
+    "typescript": "^5.3.3",
+    "vite": "^5.0.11",
+    "vitest": "^1.1.3",
+    "vitest-dom": "^0.1.1"
  },
  "dependencies": {
-    "analytics": "0.8.9",
-    "analytics-plugin-plausible": "0.0.6",
+    "@mermaid-js/mermaid-zenuml": "^0.2.0",
    "daisyui": "2.52.0",
    "dayjs": "^1.11.7",
-    "js-base64": "3.7.5",
-    "mermaid": "10.3.1",
-    "monaco-editor": "0.43.0",
+    "js-base64": "3.7.7",
+    "lodash-es": "^4.17.21",
+    "mermaid": "10.9.1",
+    "monaco-editor": "0.49.0",
    "pako": "2.1.0",
+    "plausible-tracker": "^0.3.8",
    "random-word-slugs": "0.1.7",
    "svg-pan-zoom": "3.6.1",
+    "svg2roughjs": "^3.2.0",
    "uuid": "9.0.1"
  },
  "lint-staged": {
@@ -87,8 +91,8 @@
    ]
  },
  "volta": {
-    "node": "18.17.1",
-    "yarn": "1.22.19"
+    "node": "18.20.3",
+    "yarn": "1.22.22"
  },
  "engines": {
    "node": ">=16.7"
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
@@ -15,15 +15,9 @@
    <link rel="mask-icon" href="%sveltekit.assets%/favicon.svg" color="#000000" />
    <meta name="theme-color" content="#6366F1" />
    <link rel="manifest" href="%sveltekit.assets%/manifest.json" />
-    <link
-      rel="stylesheet"
-      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css"
-      integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA=="
-      crossorigin="anonymous"
-      referrerpolicy="no-referrer" />
    %sveltekit.head%
  </head>
-  <body>
+  <body style="overflow: hidden">
    <div id="svelte">%sveltekit.body%</div>
  </body>
 </html>
@@ -1,10 +1,17 @@
+@import '@fortawesome/fontawesome-free/css/all.min.css';
+
@tailwind base;
@tailwind components;
@tailwind utilities;

 .input {
-  @apply flex-1 border-primary border-solid border-2 rounded;
+  @apply flex-1 rounded border-2 border-solid border-primary;
 }
 .action-btn {
  @apply btn btn-primary;
 }
+#graph-div sub,
+#graph-div sup {
+  position: initial;
+  vertical-align: revert;
+}
@@ -3,9 +3,8 @@
 interface ImportMetaEnv {
  readonly MERMAID_RENDERER_URL?: string;
  readonly MERMAID_KROKI_RENDERER_URL?: string;
-  readonly MERMAID_CDN_URL?: string;
-  readonly MERMAID_BASE_URL?: string;
-  readonly MERMAID_LOCAL?: boolean;
+  readonly MERMAID_ANALYTICS_URL?: string;
+  readonly MERMAID_DOMAIN?: string;
  // more env variables...
 }

@@ -1,16 +1 @@
-/* eslint-disable @typescript-eslint/no-empty-interface */
-/* eslint-disable @typescript-eslint/ban-types */
-/* eslint-disable @typescript-eslint/no-unused-vars */
-
 /// <reference types="@sveltejs/kit" />
-import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers';
-
-declare global {
-  namespace jest {
-    interface Matchers<R = void>
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-expect-error
-      // eslint-disable-next-line no-undef
-      extends TestingLibraryMatchers<typeof expect.stringContaining, R> {}
-  }
-}
@@ -1,34 +1,49 @@
 <script lang="ts">
  import { browser } from '$app/environment';
  import Card from '$lib/components/Card/Card.svelte';
+  import { waitForRender } from '$lib/util/autoSync';
  import { env } from '$lib/util/env';
  import { pakoSerde } from '$lib/util/serde';
  import { stateStore } from '$lib/util/state';
  import { logEvent } from '$lib/util/stats';
-  import { toBase64 } from 'js-base64';
  import dayjs from 'dayjs';
-  const { krokiRendererUrl, rendererUrl } = env;
+  import { toBase64 } from 'js-base64';
+  import { version as FAVersion } from '@fortawesome/fontawesome-free/package.json';

+  const FONT_AWESOME_URL = `https://cdnjs.cloudflare.com/ajax/libs/font-awesome/${FAVersion}/css/all.min.css`;
+
+  const { krokiRendererUrl, rendererUrl } = env;
  type Exporter = (context: CanvasRenderingContext2D, image: HTMLImageElement) => () => void;

-  const getFileName = (ext: string) =>
-    `mermaid-diagram-${dayjs().format('YYYY-MM-DD-HHmmss')}.${ext}`;
+  const getFileName = (extension: string) =>
+    `mermaid-diagram-${dayjs().format('YYYY-MM-DD-HHmmss')}.${extension}`;

  const getBase64SVG = (svg?: HTMLElement, width?: number, height?: number): string => {
+    if (svg) {
+      // Prevents the SVG size of the interface from being changed
+      svg = svg.cloneNode(true) as HTMLElement;
+    }
    height && svg?.setAttribute('height', `${height}px`);
    width && svg?.setAttribute('width', `${width}px`); // Workaround https://stackoverflow.com/questions/28690643/firefox-error-rendering-an-svg-image-to-html5-canvas-with-drawimage
    if (!svg) {
-      svg = getSvgEl();
+      svg = getSvgElement();
    }
    const svgString = svg.outerHTML
      .replaceAll('<br>', '<br/>')
      .replaceAll(/<img([^>]*)>/g, (m, g: string) => `<img ${g} />`);
-    return toBase64(svgString);
+
+    return toBase64(`<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="${FONT_AWESOME_URL}" type="text/css"?>
+${svgString}`);
  };

-  const exportImage = (event: Event, exporter: Exporter) => {
+  const exportImage = async (event: Event, exporter: Exporter) => {
+    await waitForRender();
+    if (document.querySelector('.outOfSync')) {
+      throw new Error('Diagram is out of sync');
+    }
    const canvas: HTMLCanvasElement = document.createElement('canvas');
-    const svg: HTMLElement | null = document.querySelector('#container svg');
+    const svg = document.querySelector<HTMLElement>('#container svg');
    if (!svg) {
      throw new Error('svg not found');
    }
@@ -49,32 +64,21 @@
    if (!context) {
      throw new Error('context not found');
    }
-    context.fillStyle = 'white';
+    context.fillStyle = `hsl(${window.getComputedStyle(document.body).getPropertyValue('--b1')})`;
    context.fillRect(0, 0, canvas.width, canvas.height);

    const image = new Image();
-    image.onload = exporter(context, image);
+    image.addEventListener('load', exporter(context, image));
    image.src = `data:image/svg+xml;base64,${getBase64SVG(svg, canvas.width, canvas.height)}`;

    event.stopPropagation();
    event.preventDefault();
  };

-  const getSvgEl = () => {
-    const svgEl: HTMLElement = document
-      .querySelector('#container svg')!
-      .cloneNode(true) as HTMLElement;
-    svgEl.setAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
-    const fontAwesomeCdnUrl = Array.from(document.head.getElementsByTagName('link'))
-      .map((l) => l.href)
-      .find((h) => h.includes('font-awesome'));
-    if (fontAwesomeCdnUrl == null) {
-      return svgEl;
-    }
-    const styleEl = document.createElement('style');
-    styleEl.innerText = `@import url("${fontAwesomeCdnUrl}");'`;
-    svgEl.prepend(styleEl);
-    return svgEl;
+  const getSvgElement = () => {
+    const svgElement = document.querySelector('#container svg')?.cloneNode(true) as HTMLElement;
+    svgElement.setAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
+    return svgElement;
  };

  const simulateDownload = (download: string, href: string): void => {
@@ -120,13 +124,13 @@
    };
  };

-  const onCopyClipboard = (event: Event) => {
-    exportImage(event, clipboardCopy);
+  const onCopyClipboard = async (event: Event) => {
+    await exportImage(event, clipboardCopy);
    logEvent('copyClipboard');
  };

-  const onDownloadPNG = (event: Event) => {
-    exportImage(event, downloadImage);
+  const onDownloadPNG = async (event: Event) => {
+    await exportImage(event, downloadImage);
    logEvent('download', {
      type: 'png'
    });
@@ -140,7 +144,7 @@
  };

  const onCopyMarkdown = () => {
-    (document.getElementById('markdown') as HTMLInputElement).select();
+    document.querySelector<HTMLInputElement>('#markdown')?.select();
    document.execCommand('Copy');
    logEvent('copyMarkdown');
  };
@@ -181,7 +185,7 @@
 </script>

 <Card title="Actions" isOpen={false}>
-  <div class="flex flex-wrap gap-2 m-2">
+  <div class="m-2 flex flex-wrap gap-2">
    {#if isClipboardAvailable()}
      <button class="action-btn w-full" on:click={onCopyClipboard}
        ><i class="far fa-copy mr-2" /> Copy Image to clipboard
@@ -209,7 +213,7 @@
      </button>
    </a>

-    <div class="flex gap-2 items-center">
+    <div class="flex items-center gap-2">
      PNG size
      <label for="autosize">
        <input type="radio" value="auto" id="autosize" bind:group={imagemodeselected} /> Auto
@@ -234,7 +238,7 @@
      {/if}
    </div>

-    <div class="w-full flex gap-2 items-center">
+    <div class="flex w-full items-center gap-2">
      <input class="input" id="markdown" type="text" value={mdCode} on:click={onCopyMarkdown} />
      <label for="markdown">
        <button class="btn btn-primary btn-md flex-auto" on:click={onCopyMarkdown}>
@@ -243,7 +247,7 @@
      </label>
    </div>

-    <div class="w-full flex gap-2 items-center">
+    <div class="flex w-full items-center gap-2">
      <input
        class="input"
        id="gist"
@@ -255,8 +259,8 @@
      </label>
    </div>
    {#if isNetlify}
-      <div class="w-full flex items-center justify-center">
-        <a class="link underline text-gray-500 text-sm" href="https://netlify.com">
+      <div class="flex w-full items-center justify-center">
+        <a class="link text-sm text-gray-500 underline" href="https://netlify.com">
          This site is powered by Netlify
        </a>
      </div>
@@ -11,20 +11,22 @@
  $: isTabsShown = isOpen && tabs.length > 0;
 </script>

-<div class="card rounded overflow-hidden m-2 flex-grow flex flex-col shadow-2xl">
+<div class="card m-2 flex flex-grow flex-col overflow-hidden rounded shadow-2xl">
  <div
+    role="toolbar"
+    tabindex="0"
    class="bg-primary p-2 {isTabsShown ? 'pb-0' : ''} flex-none cursor-pointer"
    on:click={() => (isOpen = !isOpen)}
    on:keypress={() => (isOpen = !isOpen)}>
    <div class="flex justify-between">
      <Tabs on:select {tabs} bind:isOpen {title} {isCloseable} {activeTabID} />
-      <div class="flex gap-x-4 items-center {isTabsShown ? '-mt-2' : ''}">
+      <div class="flex items-center gap-x-4 {isTabsShown ? '-mt-2' : ''}">
        <slot name="actions" />
      </div>
    </div>
  </div>
  {#if isOpen}
-    <div class="card-body p-0 flex-grow overflow-auto text-base-content" transition:slide>
+    <div class="card-body flex-grow overflow-auto p-0 text-base-content" transition:slide>
      <slot />
    </div>
  {/if}
@@ -20,6 +20,8 @@

 <div class="flex cursor-default">
  <span
+    role="menubar"
+    tabindex="0"
    class="mr-2 font-semibold"
    on:click|stopPropagation={() => (isOpen = !isOpen)}
    on:keypress|stopPropagation={() => (isOpen = !isOpen)}>
@@ -31,6 +33,8 @@
    <ul class="tabs" transition:fade>
      {#each tabs as tab}
        <div
+          role="tab"
+          tabindex="0"
          class="tab tab-lifted {activeTabID === tab.id ? 'tab-active' : 'text-primary-content'}"
          on:click|stopPropagation={() => toggleTabs(tab)}
          on:keypress|stopPropagation={() => toggleTabs(tab)}>
@@ -1,3 +1,12 @@
+<script lang="ts" context="module">
+  declare global {
+    interface Window {
+      Cypress: boolean;
+      editorLoaded: boolean;
+    }
+  }
+</script>
+
 <script lang="ts">
  import type { EditorMode } from '$lib/types';
  import { stateStore, updateCode, updateConfig } from '$lib/util/state';
@@ -10,7 +19,7 @@
  import { initEditor } from '$lib/util/monacoExtra';
  import { logEvent } from '$lib/util/stats';

-  let divEl: HTMLDivElement | undefined = undefined;
+  let divElement: HTMLDivElement | undefined;
  let editor: monaco.editor.IStandaloneCodeEditor | undefined;
  let editorOptions: monaco.editor.IStandaloneEditorConstructionOptions = {
    minimap: {
@@ -64,7 +73,7 @@
    }
  };

-  onMount(async () => {
+  onMount(() => {
    self.MonacoEnvironment = {
      getWorker(_, label) {
        if (label === 'json') {
@@ -74,16 +83,15 @@
      }
    };

-    if (!divEl) {
+    if (!divElement) {
      throw new Error('divEl is undefined');
    }
    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
    initEditor(monaco);
-    errorDebug(100);
-    editor = monaco.editor.create(divEl, editorOptions);
-    editor.onDidChangeModelContent(({ isFlush, changes }) => {
+    errorDebug();
+    editor = monaco.editor.create(divElement, editorOptions);
+    editor.onDidChangeModelContent(({ isFlush }) => {
      const newText = editor?.getValue();
-      // console.log('editor onDidChangeModelContent', { text, newText, isFlush, changes });
      if (!newText || text === newText || isFlush) {
        return;
      }
@@ -109,20 +117,17 @@
      });
    });

-    if (divEl.parentElement) {
-      resizeObserver.observe(divEl.parentElement);
+    if (divElement.parentElement) {
+      resizeObserver.observe(divElement.parentElement);
    }

-    // @ts-ignore
    if (window.Cypress) {
-      // @ts-ignore
      window.editorLoaded = true;
    }
    return () => {
-      // console.log(`editor disposed`);
      editor?.dispose();
    };
  });
 </script>

-<div bind:this={divEl} id="editor" class="overflow-hidden" />
+<div bind:this={divElement} id="editor" class="overflow-hidden" />
@@ -20,7 +20,7 @@

  dayjs.extend(dayjsRelativeTime);

-  const HISTORY_SAVE_INTERVAL = 60000;
+  const HISTORY_SAVE_INTERVAL = 60_000;

  const tabSelectHandler = (message: CustomEvent<Tab>) => {
    historyModeStore.set(message.detail.id as HistoryType);
@@ -56,17 +56,13 @@
    const input = document.createElement('input');
    input.type = 'file';
    input.accept = 'application/json';
-    input.addEventListener('change', ({ target }: Event) => {
-      const file = (<HTMLInputElement>target).files[0];
+    input.addEventListener('change', async ({ target }: Event) => {
+      const file = (target as HTMLInputElement)?.files?.[0];
      if (!file) {
        return;
      }
-      const reader = new FileReader();
-      reader.onload = (e) => {
-        const data: HistoryEntry[] = JSON.parse(e.target.result as string);
+      const data: HistoryEntry[] = JSON.parse(await file.text());
      restoreHistory(data);
-      };
-      reader.readAsText(file);
    });
    input.click();
  };
@@ -129,34 +125,34 @@
  <div slot="actions">
    <button
      id="uploadHistory"
-      class="btn btn-xs btn-secondary w-12"
+      class="btn btn-secondary btn-xs w-12"
      on:click|stopPropagation={() => uploadHistory()}
      title="Upload history"><i class="fa fa-upload" /></button>
    {#if $historyStore.length > 0}
      <button
        id="downloadHistory"
-        class="btn btn-xs btn-secondary w-12"
+        class="btn btn-secondary btn-xs w-12"
        on:click|stopPropagation={() => downloadHistory()}
        title="Download history"><i class="fa fa-download" /></button>
    {/if}
    |
    <button
      id="saveHistory"
-      class="btn btn-xs btn-success w-12"
+      class="btn btn-success btn-xs w-12"
      on:click|stopPropagation={() => saveHistory()}
      title="Save current state"><i class="far fa-save" /></button>
    {#if $historyModeStore !== 'loader'}
      <button
        id="clearHistory"
-        class="btn btn-xs btn-error w-12"
+        class="btn btn-error btn-xs w-12"
        on:click|stopPropagation={() => clearHistory()}
        title="Delete all saved states"><i class="fas fa-trash-alt" /></button>
    {/if}
  </div>
-  <ul class="p-2 space-y-2 overflow-auto h-56" id="historyList">
+  <ul class="h-56 space-y-2 overflow-auto p-2" id="historyList">
    {#if $historyStore.length > 0}
      {#each $historyStore as { id, state, time, name, url, type }}
-        <li class="rounded p-2 shadow flex-col">
+        <li class="flex-col rounded p-2 shadow">
          <div class="flex">
            <div class="flex-1">
              <div class="flex flex-col text-base-content">
@@ -165,14 +161,14 @@
                    href={url}
                    target="_blank"
                    title="Open revision in new tab"
-                    class="hover:underline text-blue-500">{name}</a>
+                    class="text-blue-500 hover:underline">{name}</a>
                {:else}
                  <span>{name}</span>
                {/if}
-                <span class="text-gray-400 text-sm">{relativeTime(time)}</span>
+                <span class="text-sm text-gray-400">{relativeTime(time)}</span>
              </div>
            </div>
-            <div class="flex gap-2 content-center">
+            <div class="flex content-center gap-2">
              <button class="btn btn-success" on:click={() => restoreHistoryItem(state)}
                ><i class="fas fa-undo mr-1" />Restore</button>
              {#if type !== 'loader'}
@@ -1,13 +1,20 @@
 <script context="module" lang="ts">
  import { version } from 'mermaid/package.json';
-  import { analytics } from '$lib/util/stats';
-  void analytics?.track('version', {
+  import { logEvent, plausible } from '$lib/util/stats';
+  void logEvent('version', {
    mermaidVersion: version
  });
 </script>

 <script lang="ts">
  import Theme from './Theme.svelte';
+  import { dismissPromotion, getActivePromotion } from '$lib/util/promos/promo';
+  import Privacy from './Privacy.svelte';
+  let isMenuOpen = false;
+
+  function toggleMenu() {
+    isMenuOpen = !isMenuOpen;
+  }

  interface Link {
    href: string;
@@ -18,11 +25,11 @@
  const links: Link[] = [
    {
      title: 'Documentation',
-      href: 'https://mermaid.js.org/intro/n00b-gettingStarted.html'
+      href: 'https://mermaid.js.org/intro/getting-started.html'
    },
    {
      title: 'Tutorial',
-      href: 'https://mermaid.js.org/config/Tutorials.html'
+      href: 'https://mermaid.js.org/ecosystem/tutorials.html'
    },
    {
      title: 'Mermaid',
@@ -38,31 +45,96 @@
    },
    {
      href: 'https://mermaidchart.com',
-      img: '/mermaidchart-logo.svg'
+      img: './mermaidchart-logo.svg'
    }
  ];
+
+  let activePromotion = getActivePromotion();
+
+  const trackBannerClick = () => {
+    if (!plausible || !activePromotion) {
+      return;
+    }
+    logEvent('bannerClick', {
+      promotion: activePromotion.id
+    });
+  };
 </script>

-<div class="navbar shadow-lg bg-primary p-0">
-  <div class="flex-1 px-2 mx-2">
+{#if activePromotion}
+  <div
+    class="top-bar z-10 flex h-fit w-full items-center justify-center bg-gradient-to-r from-[#bd34fe] to-[#ff3670] p-1 text-center text-white">
+    <div
+      class="flex flex-grow"
+      role="button"
+      tabindex="0"
+      on:click={trackBannerClick}
+      on:keypress={trackBannerClick}>
+      <svelte:component this={activePromotion.component} />
+    </div>
+    <button
+      title="Dismiss banner"
+      on:click={() => {
+        dismissPromotion(activePromotion?.id);
+        activePromotion = undefined;
+      }}>
+      <i class="fa fa-close px-2" />
+    </button>
+  </div>
+{/if}
+
+<div class="navbar bg-primary p-0 shadow-lg">
+  <div class="mx-2 flex-1 px-2">
    <span class="text-lg font-bold">
      <a href="/">Mermaid<span class="text-xs font-thin">v{version}</span> Live Editor</a>
    </span>
  </div>
-  <label for="menu-toggle" class="pointer-cursor lg:hidden block"
-    ><svg
-      class="fill-current"
+
+  <label
+    for="menu-toggle"
+    class={isMenuOpen ? 'hidden' : 'pointer-cursor fixed right-4 z-[1000] lg:hidden'}>
+    <svg
      xmlns="http://www.w3.org/2000/svg"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      class="fill-current"
      width="20"
      height="20"
-      viewBox="0 0 20 20"
-      ><title>Menu</title><path d="M0 3h20v2H0V3zm0 6h20v2H0V9zm0 6h20v2H0v-2z" /></svg
-    ></label>
-  <input class="hidden" type="checkbox" id="menu-toggle" />
+      viewBox="0 0 20 20">
+      <title>Menu</title>
+      <path d="M0 3h20v2H0V3zm0 6h20v2H0V9zm0 6h20v2H0v-2z" />
+    </svg>
+  </label>

+  <!-- Cross SVG -->
+  <label
+    for="menu-toggle"
+    class={isMenuOpen ? 'pointer-cursor fixed right-4 z-[1000] lg:hidden' : 'hidden'}>
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      class="fill-current"
+      width="20"
+      height="20"
+      viewBox="0 0 20 20">
+      <title>Cross</title>
+      <line x1="5" y1="5" x2="15" y2="15" stroke="white" stroke-width="2" />
+      <line x1="5" y1="15" x2="15" y2="5" stroke="white" stroke-width="2" />
+    </svg>
+  </label>
+
+  <input
+    class="hidden"
+    type="checkbox"
+    id="menu-toggle"
+    bind:checked={isMenuOpen}
+    on:click={toggleMenu} />
+
+  <div class="hidden w-full lg:flex lg:w-auto lg:items-center" id="menu">
    <Theme />
-  <div class="hidden lg:flex lg:items-center lg:w-auto w-full" id="menu">
-    <ul class="lg:flex items-center justify-between text-base pt-4 lg:pt-0">
+    <ul class="items-center justify-between pt-4 text-base lg:flex lg:pt-0">
+      <li>
+        <Privacy />
+      </li>
      {#each links as { title, href, icon, img }}
        <li>
          <a class="btn btn-ghost" target="_blank" {href}>
@@ -83,8 +155,13 @@

 <style>
  #menu-toggle:checked + #menu {
-    display: block;
+    position: absolute;
+    top: 2.5rem;
+    padding: 1rem 0;
+    background: #661ae6;
+    display: flex;
  }
+
  .navbar {
    z-index: 10000;
  }
@@ -115,7 +115,57 @@
    Campaign C: [0.57, 0.69]
    Campaign D: [0.78, 0.34]
    Campaign E: [0.40, 0.34]
-    Campaign F: [0.35, 0.78]`
+    Campaign F: [0.35, 0.78]`,
+    XYChart: `
+    xychart-beta
+    title "Sales Revenue"
+    x-axis [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]
+    line [5000, 6000, 7500, 8200, 9500, 10500, 11000, 10200, 9200, 8500, 7000, 6000]`,
+    Block: `block-beta
+    columns 3
+    doc>"Document"]:3
+    space down1<[" "]>(down) space
+
+  block:e:3
+          l["left"]
+          m("A wide one in the middle")
+          r["right"]
+  end
+    space down2<[" "]>(down) space
+    db[("DB")]:3
+    space:3
+    D space C
+    db --> D
+    C --> db
+    D --> C
+    style m fill:#d6d,stroke:#333,stroke-width:4px
+    `,
+    ZenUML: `zenuml
+    title Order Service
+    @Actor Client #FFEBE6
+    @Boundary OrderController #0747A6
+    @EC2 <<BFF>> OrderService #E3FCEF
+    group BusinessService {
+      @Lambda PurchaseService
+      @AzureFunction InvoiceService
+    }
+
+    @Starter(Client)
+    // \`POST /orders\`
+    OrderController.post(payload) {
+      OrderService.create(payload) {
+        order = new Order(payload)
+        if(order != null) {
+          par {
+            PurchaseService.createPO(order)
+            InvoiceService.createInvoice(order)      
+          }      
+        }
+      }
+    }
+    `
  };

  type SampleTypes = keyof typeof samples;
@@ -128,10 +178,10 @@
  };

  // Adding in this array will add an icon to the preset menu
-  const newDiagrams: SampleTypes[] = ['Mindmap', 'QuadrantChart'];
+  const newDiagrams: SampleTypes[] = ['QuadrantChart', 'XYChart', 'Block', 'ZenUML'];
  const diagramOrder: SampleTypes[] = [
-    'Sequence',
    'Flow',
+    'Sequence',
    'Class',
    'State',
    'ER',
@@ -140,19 +190,22 @@
    'Git',
    'Pie',
    'Mindmap',
-    'QuadrantChart'
+    'QuadrantChart',
+    'XYChart',
+    'Block',
+    'ZenUML'
  ];
 </script>

 <Card title="Sample Diagrams" isOpen={false}>
-  <div class="flex flex-wrap p-2 gap-2">
+  <div class="flex flex-wrap gap-2 p-2">
    {#each diagramOrder as sample}
      <button
-        class="btn btn-sm btn-primary w-28 normal-case flex-grow"
+        class="btn btn-primary btn-sm w-fit min-w-20 flex-grow normal-case"
        on:click={() => loadSampleDiagram(sample)}>
        {sample}
        {#if newDiagrams.includes(sample)}
-          <span class="ml-2 fa fa-heart" />
+          <span class="fa fa-heart ml-2" />
        {/if}
      </button>
    {/each}
@@ -0,0 +1,42 @@
+<label for="privacyModal" class="btn btn-ghost flex gap-2">
+  <i class="fa-solid fa-shield-halved text-xl"></i> Security
+</label>
+
+<input type="checkbox" id="privacyModal" class="modal-toggle" />
+<div class="modal" role="dialog">
+  <div class="modal-box flex flex-col gap-4 text-base-content">
+    <h1 class="text-3xl font-bold">Data security</h1>
+    <p>
+      <span class="text-xl font-extrabold">
+        The content of the diagrams you create never leaves your browser.
+      </span>
+      It's stored in the URL, and the browser's local storage only.
+    </p>
+    <p>
+      Mermaid live editor is a fully client side application, that will also work as an offline <a
+        href="https://web.dev/explore/progressive-web-apps"
+        class="link"
+        target="_blank">
+        PWA.
+      </a>
+    </p>
+    <p>
+      The only server we have is a self hosted version of the open source and privacy friendly
+      Plausible Analytics. We only collect data related to actions performed, like the type of
+      diagram rendered, number of times a feature was used, etc. <br /> All the data we collect is
+      anonymized and
+      <a href="https://p.mermaid.live/mermaid.live" class="link" target="_blank">
+        available publicly.
+      </a>
+    </p>
+
+    <p>
+      Additional services like the external PNG/SVG/Kroki links and "Save to Mermaid Chart" feature
+      will share your diagram with the respective 3rd party service.
+    </p>
+
+    <label class="btn btn-circle btn-ghost btn-sm absolute right-2 top-2" for="privacyModal">
+      X
+    </label>
+  </div>
+</div>
@@ -26,14 +26,14 @@
  ];
 </script>

-<div class="hidden lg:block dropdown">
+<div class="dropdown hidden lg:block">
  <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
  <div tabindex="0" class="btn btn-ghost">
    <svg
      xmlns="http://www.w3.org/2000/svg"
      fill="none"
      viewBox="0 0 24 24"
-      class="inline-block w-6 h-6 stroke-current md:mr-2"
+      class="inline-block h-6 w-6 stroke-current md:mr-2"
      ><path
        stroke-linecap="round"
        stroke-linejoin="round"
@@ -43,17 +43,19 @@
    <svg
      xmlns="http://www.w3.org/2000/svg"
      viewBox="0 0 1792 1792"
-      class="inline-block w-4 h-4 ml-1 fill-current"
+      class="ml-1 inline-block h-4 w-4 fill-current"
      ><path
        d="M1395 736q0 13-10 23l-466 466q-10 10-23 10t-23-10l-466-466q-10-10-10-23t10-23l50-50q10-10 23-10t23 10l393 393 393-393q10-10 23-10t23 10l50 50q10 10 10 23z" /></svg>
  </div>
  <div
-    class="mt-14 overflow-y-auto shadow-2xl top-px dropdown-content h-96 w-56 bg-base-200 text-base-content">
+    class="dropdown-content top-px mt-14 h-96 w-56 overflow-y-auto bg-base-200 text-base-content shadow-2xl">
    <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
-    <ul tabindex="0" class="p-4 menu compact">
+    <ul tabindex="0" class="menu compact p-4">
      {#each themes as theme}
        <li class:bordered={$themeStore.theme !== undefined && theme.includes($themeStore.theme)}>
          <span
+            role="menuitem"
+            tabindex="0"
            class="btn btn-ghost justify-start"
            on:click={() => setTheme(theme)}
            on:keypress={() => setTheme(theme)}>{theme}</span>
@@ -1,18 +1,22 @@
 <script lang="ts">
+  import type { State, ValidatedState } from '$lib/types';
+  import { recordRenderTime, shouldRefreshView } from '$lib/util/autoSync';
+  import { render as renderDiagram } from '$lib/util/mermaid';
  import { inputStateStore, stateStore, updateCodeStore } from '$lib/util/state';
+  import { logEvent, saveStatistics } from '$lib/util/stats';
+  import { cmdKey } from '$lib/util/util';
+  import type { MermaidConfig } from 'mermaid';
  import { onMount } from 'svelte';
  import panzoom from 'svg-pan-zoom';
-  import type { State, ValidatedState } from '$lib/types';
-  import { logEvent } from '$lib/util/stats';
-  import { cmdKey } from '$lib/util/util';
-  import { render as renderDiagram } from '$lib/util/mermaid';
-  import type { MermaidConfig } from 'mermaid';
+  import { Svg2Roughjs } from 'svg2roughjs';

  let code = '';
  let config = '';
  let container: HTMLDivElement;
+  let rough: boolean;
  let view: HTMLDivElement;
  let error = false;
+  let errorLines: string[] = [];
  let outOfSync = false;
  let hide = false;
  let manualUpdate = true;
@@ -37,7 +41,7 @@
    pzoom?.destroy();
    pzoom = undefined;
    void Promise.resolve().then(() => {
-      const graphDiv = document.getElementById('graph-div');
+      const graphDiv = document.querySelector<HTMLElement>('#graph-div');
      if (!graphDiv) {
        return;
      }
@@ -58,8 +62,10 @@
  };

  const handleStateChange = async (state: ValidatedState) => {
+    const startTime = Date.now();
    if (state.error !== undefined) {
      error = true;
+      errorLines = state.error.toString().split('\n');
      return;
    }
    error = false;
@@ -71,13 +77,25 @@
        outOfSync = false;
        manualUpdate = true;
        // Do not render if there is no change in Code/Config/PanZoom
-        if (code === state.code && config === state.mermaid && panZoomEnabled === state.panZoom) {
+        if (
+          code === state.code &&
+          config === state.mermaid &&
+          panZoomEnabled === state.panZoom &&
+          rough === state.rough
+        ) {
          return;
        }
+
+        if (!shouldRefreshView()) {
+          outOfSync = true;
+          return;
+        }
+
        code = state.code;
        config = state.mermaid;
        panZoomEnabled = state.panZoom;
-        const scroll = view.parentElement!.scrollTop;
+        rough = state.rough;
+        const scroll = view.parentElement?.scrollTop;
        delete container.dataset.processed;
        const { svg, bindFunctions } = await renderDiagram(
          Object.assign({}, JSON.parse(state.mermaid)) as MermaidConfig,
@@ -88,29 +106,51 @@
        if (svg.length > 0) {
          handlePanZoom(state);
          container.innerHTML = svg;
-          console.log({ svg });
-          const graphDiv = document.getElementById('graph-div');
+          const graphDiv = document.querySelector<SVGSVGElement>('#graph-div');
          if (!graphDiv) {
            throw new Error('graph-div not found');
          }
+          if (state.rough) {
+            const svg2roughjs = new Svg2Roughjs('#container');
+            svg2roughjs.svg = graphDiv;
+            await svg2roughjs.sketch();
+            graphDiv.remove();
+            const sketch = document.querySelector<HTMLElement>('#container > svg');
+            if (!sketch) {
+              throw new Error('sketch not found');
+            }
+            const height = sketch.getAttribute('height');
+            const width = sketch.getAttribute('width');
+            sketch.setAttribute('height', '100%');
+            sketch.setAttribute('width', '100%');
+            sketch.setAttribute('viewBox', `0 0 ${width} ${height}`);
+            sketch.style.maxWidth = '100%';
+          } else {
            graphDiv.setAttribute('height', '100%');
            graphDiv.style.maxWidth = '100%';
            if (bindFunctions) {
              bindFunctions(graphDiv);
            }
          }
-
-        view.parentElement!.scrollTop = scroll;
+        }
+        if (view.parentElement && scroll) {
+          view.parentElement.scrollTop = scroll;
+        }
        error = false;
      } else if (manualUpdate) {
        manualUpdate = false;
      } else if (code !== state.code || config !== state.mermaid) {
        outOfSync = true;
      }
-    } catch (e) {
-      console.error('view fail', e);
+    } catch (error_) {
+      console.error('view fail', error_);
      error = true;
    }
+    const renderTime = Date.now() - startTime;
+    saveStatistics({ code, renderTime, isRough: state.rough });
+    recordRenderTime(renderTime, () => {
+      $inputStateStore.updateDiagram = true;
+    });
  };

  onMount(() => {
@@ -127,20 +167,26 @@

 {#if (error && $stateStore.error instanceof Error) || outOfSync}
  <div
-    class="absolute w-full p-2 z-10 font-mono {error
+    class="absolute z-10 w-full p-2 font-mono {error
      ? 'text-red-600'
      : 'text-yellow-600'} bg-base-100 bg-opacity-80 text-left"
    id="errorContainer">
    {#if error}
-      {@html $stateStore.error?.toString().replace(/\n/g, '<br />')}
+      {#each errorLines as line}
+        {line}<br />
+      {/each}
    {:else}
      Diagram out of sync. <br />
+      {#if $stateStore.autoSync}
+        It will be updated automatically.
+      {:else}
        Press <i class="fas fa-sync" /> (Sync button) or <kbd>{cmdKey} + Enter</kbd> to sync.
      {/if}
+    {/if}
  </div>
 {/if}

-<div id="view" bind:this={view} class="p-2 h-full" class:error class:outOfSync>
+<div id="view" bind:this={view} class="h-full p-2" class:error class:outOfSync>
  <div id="container" bind:this={container} class="h-full overflow-auto" class:hide />
 </div>

@@ -23,6 +23,7 @@ export interface State {
  mermaid: string;
  updateDiagram: boolean;
  autoSync: boolean;
+  rough: boolean;
  editorMode?: EditorMode;
  panZoom?: boolean;
  pan?: { x: number; y: number };
@@ -0,0 +1,49 @@
+import debounce from 'lodash-es/debounce';
+import { get } from 'svelte/store';
+import { stateStore } from './state';
+
+let shouldSync = true;
+let updater: () => void;
+let renderPromise: Promise<void> | undefined;
+let resolveRenderPromise: (() => void) | undefined;
+const renderDelay = 1000;
+const slowRenderThreshold = 150;
+
+const debouncedRender = debounce(() => {
+  shouldSync = true;
+  updater();
+}, renderDelay);
+
+export const recordRenderTime = (renderTimeMs: number, updaterFunction: () => void): void => {
+  resolveRenderPromise?.();
+  const { autoSync } = get(stateStore);
+  if (!autoSync) {
+    return;
+  }
+  updater = updaterFunction;
+  const isSlow = renderTimeMs > slowRenderThreshold;
+  if (!shouldSync) {
+    debouncedRender();
+  }
+  shouldSync = !isSlow;
+};
+
+export const shouldRefreshView = (): boolean => {
+  if (!renderPromise) {
+    renderPromise = new Promise((resolve) => {
+      resolveRenderPromise = () => {
+        renderPromise = undefined;
+        resolve();
+      };
+    });
+  }
+
+  if (!shouldSync) {
+    debouncedRender();
+  }
+  return shouldSync;
+};
+
+export const waitForRender = (): Promise<void> => {
+  return renderPromise ?? Promise.resolve();
+};
@@ -1,9 +1,6 @@
 export const env = {
  rendererUrl: import.meta.env.MERMAID_RENDERER_URL ?? 'https://mermaid.ink',
  krokiRendererUrl: import.meta.env.MERMAID_KROKI_RENDERER_URL ?? 'https://kroki.io',
-  mermaidCDNUrl: import.meta.env.MERMAID_CDN_URL ?? 'https://unpkg.com/@mermaid-js',
-  mermaidBaseURL: import.meta.env.MERMAID_BASE_URL ?? 'http://localhost:9000',
-  useLocalMermaid: import.meta.env.MERMAID_LOCAL ?? false,
-  isDev: import.meta.env.DEV,
-  baseURL: import.meta.env.BASE_URL
-};
+  analyticsUrl: import.meta.env.MERMAID_ANALYTICS_URL ?? '',
+  domain: import.meta.env.MERMAID_DOMAIN ?? 'mermaid.live'
+} as const;
@@ -2,9 +2,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-explicit-any */
+import { addHistoryEntry } from '$lib/components/History/history';
 import type { State } from '$lib/types';
 import { defaultState } from '$lib/util/state';
-import { addHistoryEntry } from '$lib/components/History/history';
 import { fetchJSON, fetchText } from '$lib/util/util';

 const codeFileName = 'code.mmd';
@@ -102,14 +102,18 @@ export const loadGistData = async (gistURL: string): Promise<State> => {
  );
  const gistHistory: GistData[] = [];
  for (const entry of history) {
-    const data: GistData | undefined = await getGistData(entry.url).catch();
-    data && gistHistory.push(data);
+    try {
+      const data: GistData = await getGistData(entry.url);
+      gistHistory.push(data);
+    } catch (error) {
+      console.error(error);
+    }
  }
  if (gistHistory.length === 0) {
    throw new Error('Invalid gist provided');
  }
  gistHistory.reverse();
-  const entry = gistHistory.slice(-1).pop();
+  const entry = gistHistory.at(-1);
  if (!entry) {
    throw new Error('Invalid gist provided');
  }
@@ -1,11 +1,16 @@
 import mermaid from 'mermaid';
 import type { MermaidConfig, RenderResult } from 'mermaid';
+import zenuml from '@mermaid-js/mermaid-zenuml';
+
+const init = mermaid.registerExternalDiagrams([zenuml]);

 export const render = async (
  config: MermaidConfig,
  code: string,
  id: string
 ): Promise<RenderResult> => {
+  await init;
+
  // Should be able to call this multiple times without any issues.
  mermaid.initialize(config);

@@ -204,6 +204,11 @@ export const initEditor = (monacoEditor: typeof Monaco): void => {
        'Rel_Back',
        'RelIndex'
      ]
+    },
+    sankey: {
+      typeKeywords: ['sankey-beta'],
+      blockKeywords: [],
+      keywords: []
    }
  };

@@ -248,6 +253,7 @@ export const initEditor = (monacoEditor: typeof Monaco): void => {
        [/^\s*stateDiagram(-v2)?/, 'typeKeyword', 'stateDiagram'],
        [/^\s*er(Diagram)?/, 'typeKeyword', 'erDiagram'],
        [/^\s*requirement(Diagram)?/, 'typeKeyword', 'requirementDiagram'],
+        [/^\s*sankey-beta/m, 'typeKeyword', 'sankey'],
        [
          /^\s*(C4Context|C4Container|C4Component|C4Dynamic|C4Deployment)/m,
          'typeKeyword',
@@ -535,6 +541,16 @@ export const initEditor = (monacoEditor: typeof Monaco): void => {
        [/,/, 'delimiter.bracket'],
        [/\)/, { next: '@pop', token: 'delimiter.bracket' }],
        [/[^),]/, 'string']
+      ],
+      sankey: [
+        configDirectiveHandler,
+        [/(title)(.*)/, ['keyword', 'string']],
+        [/(accTitle|accDescr)(\s*:)(\s*[^\n\r]+$)/, ['keyword', 'delimiter.bracket', 'string']],
+        [/".*?"/, 'string'],
+        [/[A-Za-z]+/, 'string'],
+        [/\s*\d+/, 'number'],
+        [/,/, 'delimiter.bracket'],
+        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
      ]
    }
  });
@@ -213,7 +213,7 @@ function getBrowserStorage(
        disconnect();
      }
    },
-    getValue(key: string): any | null {
+    getValue(key: string): any {
      const value = browserStorage.getItem(key);
      return deserialize(value);
    },
@@ -0,0 +1,7 @@
+<a
+  href="https://www.mermaidchart.com/app/user/billing/checkout?coupon=HOLIDAYS2023"
+  target="_blank"
+  class="flex-grow tracking-wide">
+  Get AI, team collaboration, storage, and more with
+  <span class="font-bold underline">Mermaid Chart Pro. Start free trial today & get 25% off.</span>
+</a>
@@ -0,0 +1,25 @@
+<script lang="ts">
+  const taglines = {
+    announcement_bar_ai_diagramming: 'Try diagramming with ChatGPT at Mermaid Chart',
+    announcement_bar_visual_editor: "Try Mermaid's Visual Editor at Mermaid Chart",
+    announcement_bar_live_collaboration: 'Enjoy live collaboration with teammates at Mermaid Chart'
+  };
+  const taglineKeys = Object.keys(taglines);
+  const taglineKey = taglineKeys[Math.floor(Math.random() * taglineKeys.length)];
+  const tagline = taglines[taglineKey];
+  const url =
+    'https://www.mermaidchart.com/?' +
+    new URLSearchParams({
+      utm_source: 'mermaid_live_editor',
+      utm_medium: taglineKey,
+      utm_campaign: 'promo_2024'
+    }).toString();
+</script>
+
+<a
+  href={url}
+  target="_blank"
+  class="flex flex-grow justify-center gap-6 align-middle tracking-wide">
+  {tagline}
+  <button class="rounded bg-gray-800 p-1 px-4 text-sm font-light">Try it now</button>
+</a>
@@ -0,0 +1,54 @@
+import { writable, type Writable, get } from 'svelte/store';
+import { persist, localStorage } from '../persist';
+import Holiday2023 from './Holiday2023.svelte';
+import Jan2024 from './Jan2024.svelte';
+
+interface Promotion {
+  id: string;
+  startDate: Date;
+  endDate: Date;
+  component: ConstructorOfATypedSvelteComponent;
+}
+
+const promotions: Promotion[] = [
+  {
+    id: 'holiday-2023',
+    startDate: new Date('2023-11-27'),
+    endDate: new Date('2024-01-09'),
+    component: Holiday2023
+  },
+  {
+    id: 'jan-2024',
+    startDate: new Date('2024-01-10'),
+    endDate: new Date('2024-06-01'),
+    component: Jan2024
+  }
+];
+
+export const dismissPromotion = (id?: string): void => {
+  if (!id) {
+    return;
+  }
+  dismissedPromotionsStore.update((dismissedIDs: string[]) => {
+    dismissedIDs.push(id);
+    return dismissedIDs;
+  });
+};
+
+const dismissedPromotionsStore: Writable<string[]> = persist(
+  writable([]),
+  localStorage(),
+  'dismissedPromotions'
+);
+
+export const getActivePromotion = (): Promotion | undefined => {
+  const dismissedPromotions = get(dismissedPromotionsStore);
+  const now = new Date();
+  return promotions
+    .filter(
+      (p: Promotion) =>
+        p.startDate <= now && p.endDate >= now && !dismissedPromotions.includes(p.id)
+    )
+    .sort((a: Promotion, b: Promotion) => b.endDate.getTime() - a.endDate.getTime())
+    .pop();
+};
@@ -13,19 +13,19 @@ const verifySerde = (state: State, serde?: SerdeType): string => {
 describe('Serde tests', () => {
  it('should serialize and deserialize with default serde', () => {
    expect(verifySerde(defaultState)).toMatchInlineSnapshot(
-      '"pako:eNpVjk2Lg0AMhv9KyGkL9Q94WGh1t5fCFurN6SFo7AztfDBGpKj_fcd62c0pvM_zhkzY-JYxx-7px0ZTFKhK5SDNoS50NL1Y6m-QZZ_ziQWsd_ya4fhx8tBrH4Jx993mH1cJium8agyijXssGyre_R_HM5T1mYL4cPtLqtHP8FWbi07n_xMdObW-647yjrKGIhQU3wru0XK0ZNr0_rQmCkWzZYV5WlvuaHiKQuWWpNIg_vpyDeYSB97jEFoSLg3dI9ktXH4B_cJWqw"'
+      `"pako:eNpVjs1qw0AMhF9F6NRC_AI-FBq7zSXQQnPz5iBs2bvE-8NaSwi2373r-NLqJM18M2jG1neMJfajv7eaosClVg7yvDeVjmYSS9MViuJtObGA9Y4fCxxfTh4m7UMwbnjd-eMGQTWfN4xBtHG3dbeqZ_7L8QJ1c6YgPlz_Ope7X-CjMd861_93dOSc-mx6KnsqWopQUXwieEDL0ZLp8vvzpigUzZYVlnntuKc0ikLl1oxSEv_zcC2WEhMfMPo0aMyd45SvFDoSrg0NkeyOrL_WfFuF"`
    );
  });

  it('should serialize and deserialize with base64 serde', () => {
    expect(verifySerde(defaultState, 'base64')).toMatchInlineSnapshot(
-      '"base64:eyJjb2RlIjoiZmxvd2NoYXJ0IFREXG4gICAgQVtDaHJpc3RtYXNdIC0tPnxHZXQgbW9uZXl8IEIoR28gc2hvcHBpbmcpXG4gICAgQiAtLT4gQ3tMZXQgbWUgdGhpbmt9XG4gICAgQyAtLT58T25lfCBEW0xhcHRvcF1cbiAgICBDIC0tPnxUd298IEVbaVBob25lXVxuICAgIEMgLS0-fFRocmVlfCBGW2ZhOmZhLWNhciBDYXJdXG4gICIsIm1lcm1haWQiOiJ7XG4gIFwidGhlbWVcIjogXCJkZWZhdWx0XCJcbn0iLCJhdXRvU3luYyI6dHJ1ZSwidXBkYXRlRGlhZ3JhbSI6dHJ1ZX0"'
+      `"base64:eyJjb2RlIjoiZmxvd2NoYXJ0IFREXG4gICAgQVtDaHJpc3RtYXNdIC0tPnxHZXQgbW9uZXl8IEIoR28gc2hvcHBpbmcpXG4gICAgQiAtLT4gQ3tMZXQgbWUgdGhpbmt9XG4gICAgQyAtLT58T25lfCBEW0xhcHRvcF1cbiAgICBDIC0tPnxUd298IEVbaVBob25lXVxuICAgIEMgLS0-fFRocmVlfCBGW2ZhOmZhLWNhciBDYXJdXG4gICIsIm1lcm1haWQiOiJ7XG4gIFwidGhlbWVcIjogXCJkZWZhdWx0XCJcbn0iLCJhdXRvU3luYyI6dHJ1ZSwicm91Z2giOmZhbHNlLCJ1cGRhdGVEaWFncmFtIjp0cnVlfQ"`
    );
  });

  it('should serialize and deserialize with pako serde', () => {
    expect(verifySerde(defaultState, 'pako')).toMatchInlineSnapshot(
-      '"pako:eNpVjk2Lg0AMhv9KyGkL9Q94WGh1t5fCFurN6SFo7AztfDBGpKj_fcd62c0pvM_zhkzY-JYxx-7px0ZTFKhK5SDNoS50NL1Y6m-QZZ_ziQWsd_ya4fhx8tBrH4Jx993mH1cJium8agyijXssGyre_R_HM5T1mYL4cPtLqtHP8FWbi07n_xMdObW-647yjrKGIhQU3wru0XK0ZNr0_rQmCkWzZYV5WlvuaHiKQuWWpNIg_vpyDeYSB97jEFoSLg3dI9ktXH4B_cJWqw"'
+      `"pako:eNpVjs1qw0AMhF9F6NRC_AI-FBq7zSXQQnPz5iBs2bvE-8NaSwi2373r-NLqJM18M2jG1neMJfajv7eaosClVg7yvDeVjmYSS9MViuJtObGA9Y4fCxxfTh4m7UMwbnjd-eMGQTWfN4xBtHG3dbeqZ_7L8QJ1c6YgPlz_Ope7X-CjMd861_93dOSc-mx6KnsqWopQUXwieEDL0ZLp8vvzpigUzZYVlnntuKc0ikLl1oxSEv_zcC2WEhMfMPo0aMyd45SvFDoSrg0NkeyOrL_WfFuF"`
    );
  });

@@ -1,12 +1,11 @@
-import { writable, get, type Readable, derived } from 'svelte/store';
-import { persist, localStorage } from './persist';
-import { saveStatistics, countLines } from './stats';
-import { serializeState, deserializeState } from './serde';
-import { cmdKey, errorDebug, formatJSON } from './util';
-import { parse } from './mermaid';
-
 import type { ErrorHash, MarkerData, State, ValidatedState } from '$lib/types';
+import { debounce } from 'lodash-es';
 import type { MermaidConfig } from 'mermaid';
+import { derived, get, writable, type Readable } from 'svelte/store';
+import { parse } from './mermaid';
+import { localStorage, persist } from './persist';
+import { deserializeState, serializeState } from './serde';
+import { errorDebug, formatJSON } from './util';

 export const defaultState: State = {
  code: `flowchart TD
@@ -20,6 +19,7 @@ export const defaultState: State = {
    theme: 'default'
  }),
  autoSync: true,
+  rough: false,
  updateDiagram: true
 };

@@ -134,7 +134,6 @@ export const updateCodeStore = (newState: Partial<State>): void => {
  });
 };

-let prompted = false;
 export const updateCode = (
  code: string,
  {
@@ -142,21 +141,7 @@ export const updateCode = (
    resetPanZoom = false
  }: { updateDiagram?: boolean; resetPanZoom?: boolean } = {}
 ): void => {
-  // console.log('updateCode', code);
-  const lines = countLines(code);
-  saveStatistics(code);
  errorDebug();
-  if (lines > 50 && !prompted && get(stateStore).autoSync) {
-    const turnOff = confirm(
-      `Long diagram detected. Turn off Auto Sync? Use ${cmdKey} + Enter or click the sync logo to manually sync.`
-    );
-    prompted = true;
-    if (turnOff) {
-      updateCodeStore({
-        autoSync: false
-      });
-    }
-  }

  inputStateStore.update((state) => {
    if (resetPanZoom) {
@@ -185,13 +170,13 @@ export const toggleDarkTheme = (dark: boolean): void => {
  });
 };

-let urlDebounce: number;
 export const initURLSubscription = (): void => {
-  stateStore.subscribe(({ serialized }) => {
-    clearTimeout(urlDebounce);
-    urlDebounce = window.setTimeout(() => {
-      history.replaceState(undefined, '', `#${serialized}`);
+  const updateHash = debounce((hash) => {
+    history.replaceState(undefined, '', `#${hash}`);
  }, 250);
+
+  stateStore.subscribe(({ serialized }) => {
+    updateHash(serialized);
  });
 };

@@ -1,24 +1,17 @@
 import { browser } from '$app/environment';
-import type { AnalyticsInstance } from 'analytics';
-export let analytics: AnalyticsInstance | undefined;
+import type PlausibleInstance from 'plausible-tracker';
+import { env } from './env';
+export let plausible: ReturnType<typeof PlausibleInstance> | undefined;

 export const initAnalytics = async (): Promise<void> => {
-  if (browser && !analytics) {
+  if (browser && !plausible) {
    try {
-      const [{ Analytics }, { default: plausible }] = await Promise.all([
-        import('analytics'),
-        import('analytics-plugin-plausible')
-      ]);
-      analytics = Analytics({
-        app: 'mermaid-live-editor',
-        plugins: [
-          plausible({
-            domain: 'mermaid.live',
+      const { default: Plausible } = await import('plausible-tracker');
+      plausible = Plausible({
+        domain: env.domain,
        hashMode: false,
        // All tracked stats are public and available at https://p.mermaid.live/mermaid.live
-            apiHost: 'https://p.mermaid.live'
-          })
-        ]
+        apiHost: env.analyticsUrl
      });
    } catch (error) {
      console.log(error);
@@ -42,7 +35,7 @@ export const detectType = (text: string): string | undefined => {
    'mindmap'
  ];
  const firstLine = text
-    .replace(/^\s*%%.*\n/g, '\n')
+    .replaceAll(/^\s*%%.*\n/g, '\n')
    .trimStart()
    .split(' ')[0]
    .toLowerCase();
@@ -54,14 +47,27 @@ export const countLines = (code: string): number => {
  return (code.match(/\n/g)?.length ?? 0) + 1;
 };

-export const saveStatistics = (graph: string): void => {
-  const graphType = detectType(graph);
+export const saveStatistics = ({
+  code,
+  renderTime,
+  isRough
+}: {
+  code: string;
+  renderTime: number;
+  isRough: boolean;
+}): void => {
+  const graphType = detectType(code);
  if (!graphType) {
    return;
  }
-  const length = countLines(graph);
-  const lengthBucket =
-    length < 10
+  const length = countLines(code);
+  const lengthBucket = getBucket(length);
+  const renderTimeMsBucket = getBucket(renderTime);
+  logEvent('render', { graphType, length, lengthBucket, renderTimeMsBucket, isRough });
+};
+
+const getBucket = (length: number): string => {
+  return length < 10
    ? '0-10'
    : length < 25
      ? '10-25'
@@ -79,8 +85,15 @@ export const saveStatistics = (graph: string): void => {
                  ? '700-1000'
                  : length < 1500
                    ? '1000-1500'
-      : '1500+';
-  logEvent('render', { graphType, length, lengthBucket });
+                    : length < 2500
+                      ? '1500-2500'
+                      : length < 4500
+                        ? '2500-4500'
+                        : length < 7000
+                          ? '4500-7000'
+                          : length < 10_000
+                            ? '7000-10000'
+                            : '10000+';
 };

 const minutesToMilliSeconds = (minutes: number): number => {
@@ -99,20 +112,29 @@ const delaysPerEvent = {
  renderDiagram: defaultDelay,
  history: defaultDelay,
  migration: defaultDelay,
-  themeChange: defaultDelay
+  themeChange: defaultDelay,
+  bannerClick: defaultDelay,
+  version: defaultDelay
 };
 export type AnalyticsEvent = keyof typeof delaysPerEvent;
 const timeouts: Map<string, number> = new Map<string, number>();
 // manual debounce to reduce the number of events sent to analytics
-export const logEvent = (name: AnalyticsEvent, data?: unknown): void => {
-  if (!analytics) {
+export const logEvent = (
+  name: AnalyticsEvent,
+  data?: Record<string, string | number | boolean>
+): void => {
+  if (!plausible) {
    return;
  }
  const key = data ? JSON.stringify({ name, data }) : name;
  if (timeouts.has(key)) {
    clearTimeout(timeouts.get(key));
  } else {
-    void analytics.track(name, data);
+    plausible.trackEvent(
+      name,
+      { props: data },
+      { url: window.location.origin + window.location.pathname }
+    );
  }
  timeouts.set(
    key,
@@ -1,5 +1,5 @@
 import { initURLSubscription, loadState, updateCodeStore } from './state';
-import { analytics, initAnalytics } from './stats';
+import { plausible, initAnalytics } from './stats';
 import { loadDataFromUrl } from './fileLoaders/loader';
 import { initLoading } from './loading';
 import { applyMigrations } from './migrations';
@@ -21,14 +21,14 @@ export const initHandler = async (): Promise<void> => {
  syncDiagram();
  initURLSubscription();
  await initAnalytics();
-  await analytics?.page();
+  plausible?.trackPageview({ url: window.location.origin + window.location.pathname });
 };

 export const isMac = navigator.platform.toUpperCase().includes('MAC');
 export const cmdKey = isMac ? 'Cmd' : 'Ctrl';

 let count = 0;
-export const errorDebug = (limit = 100) => {
+export const errorDebug = (limit = 1000) => {
  count += 1;
  if (count > limit) {
    console.log(count, limit);
@@ -34,7 +34,7 @@

    themeStore.subscribe(({ theme, isDark }) => {
      if (theme) {
-        document.getElementsByTagName('html')[0].setAttribute('data-theme', theme);
+        document.querySelectorAll('html')[0].dataset.theme = theme;
        toggleDarkTheme(isDark);
      }
    });
@@ -47,8 +47,8 @@

 {#if $loadingStateStore.loading}
  <div
-    class="w-screen h-screen z-50 absolute left-0 top-0 bg-gray-600 opacity-50 flex align-middle justify-center">
-    <div class="text-indigo-100 text-4xl font-bold my-auto">
+    class="absolute left-0 top-0 z-50 flex h-screen w-screen justify-center bg-gray-600 align-middle opacity-50">
+    <div class="my-auto text-4xl font-bold text-indigo-100">
      <div class="loader mx-auto" />
      <div>{$loadingStateStore.message}</div>
    </div>
@@ -1,57 +1,86 @@
 <script lang="ts">
+  import { dev } from '$app/environment';
+  import { base } from '$app/paths';
+  import Actions from '$lib/components/Actions.svelte';
+  import Card from '$lib/components/Card/Card.svelte';
  import Editor from '$lib/components/Editor.svelte';
+  import History from '$lib/components/History/History.svelte';
  import Navbar from '$lib/components/Navbar.svelte';
  import Preset from '$lib/components/Preset.svelte';
-  import Actions from '$lib/components/Actions.svelte';
  import View from '$lib/components/View.svelte';
-  import Card from '$lib/components/Card/Card.svelte';
-  import History from '$lib/components/History/History.svelte';
+  import type { DocumentationConfig, EditorMode, Tab, ValidatedState } from '$lib/types';
  import { inputStateStore, stateStore, updateCodeStore } from '$lib/util/state';
  import { cmdKey, initHandler, syncDiagram } from '$lib/util/util';
  import { onMount } from 'svelte';
-  import { base } from '$app/paths';
-  import { dev } from '$app/environment';
-  import type { Tab, DocumentationConfig, EditorMode, ValidatedState } from '$lib/types';

  const MCBaseURL = dev ? 'http://localhost:5174' : 'https://mermaidchart.com';
-  const docURLBase = 'https://mermaid-js.github.io/mermaid';
+  const docURLBase = 'https://mermaid.js.org';
  const docMap: DocumentationConfig = {
    graph: {
-      code: '/#/flowchart',
-      config: '/#/flowchart?id=configuration'
+      code: '/syntax/.html',
+      config: '/syntax/.html#configuration'
    },
    flowchart: {
-      code: '/#/flowchart',
-      config: '/#/flowchart?id=configuration'
+      code: '/syntax/flowchart.html',
+      config: '/syntax/flowchart.html#configuration'
    },
    sequenceDiagram: {
-      code: '/#/sequenceDiagram',
-      config: '/#/sequenceDiagram?id=configuration'
+      code: '/syntax/sequenceDiagram.html',
+      config: '/syntax/sequenceDiagram.html#configuration'
    },
    classDiagram: {
-      code: '/#/classDiagram',
-      config: '/#/classDiagram?id=configuration'
+      code: '/syntax/classDiagram.html',
+      config: '/syntax/classDiagram.html#configuration'
    },
    'stateDiagram-v2': {
-      code: '/#/stateDiagram'
+      code: '/syntax/stateDiagram.html'
    },
    gantt: {
-      code: '/#/gantt',
-      config: '/#/gantt?id=configuration'
+      code: '/syntax/gantt.html',
+      config: '/syntax/gantt.html#configuration'
    },
    pie: {
-      code: '/#/pie'
+      code: '/syntax/pie.html',
+      config: '/syntax/pie.html#configuration'
    },
    erDiagram: {
-      code: '/#/entityRelationshipDiagram',
-      config: '/#/entityRelationshipDiagram?id=styling'
+      code: '/syntax/entityRelationshipDiagram.html',
+      config: '/syntax/entityRelationshipDiagram.html#styling'
    },
    journey: {
-      code: '/#/user-journey'
+      code: '/syntax/userJourney.html'
    },
    gitGraph: {
-      code: '/#/gitgraph',
-      config: '/#/gitgraph?id=gitgraph-specific-configuration-options'
+      code: '/syntax/gitgraph.html',
+      config: '/syntax/gitgraph.html#gitgraph-specific-configuration-options'
+    },
+    quadrantChart: {
+      code: '/syntax/quadrantChart.html',
+      config: '/syntax/quadrantChart.html#chart-configurations'
+    },
+    requirementDiagram: {
+      code: '/syntax/requirementDiagram.html'
+    },
+    C4Context: {
+      code: '/syntax/c4.html'
+    },
+    mindmap: {
+      code: '/syntax/mindmap.html'
+    },
+    timeline: {
+      code: '/syntax/timeline.html',
+      config: '/syntax/timeline.html#themes'
+    },
+    zenuml: {
+      code: '/syntax/zenuml.html'
+    },
+    'sankey-beta': {
+      code: '/syntax/sankey.html',
+      config: '/syntax/sankey.html#configuration'
+    },
+    'xychart-beta': {
+      code: '/syntax/xyChart.html',
+      config: '/syntax/xyChart.html#chart-configurations'
    }
  };
  let docURL = docURLBase;
@@ -59,7 +88,7 @@
  let docKey = '';
  stateStore.subscribe(({ code, editorMode }: ValidatedState) => {
    activeTabID = editorMode;
-    const codeTypeMatch = /([\S]+)[\s\n]/.exec(code);
+    const codeTypeMatch = /(\S+)\s/.exec(code);
    if (codeTypeMatch && codeTypeMatch.length > 1) {
      docKey = codeTypeMatch[1];
      const docConfig = docMap[docKey] ?? { code: '' };
@@ -87,14 +116,14 @@

  onMount(async () => {
    await initHandler();
-    const resizer = document.getElementById('resizeHandler');
-    const element = document.getElementById('editorPane');
+    const resizer = document.querySelector<HTMLElement>('#resizeHandler');
+    const element = document.querySelector<HTMLElement>('#editorPane');
    if (!resizer || !element) {
      console.debug('Failed to find resize handler or editor pane', { resizer, element });
      return;
    }
-    const resize = (e: { pageX: number }) => {
-      const newWidth = e.pageX - element.getBoundingClientRect().left;
+    const resize = ({ pageX }: { pageX: number }) => {
+      const newWidth = pageX - element.getBoundingClientRect().left;
      if (newWidth > 50) {
        element.style.width = `${newWidth}px`;
      }
@@ -103,22 +132,22 @@
    const stopResize = () => {
      window.removeEventListener('mousemove', resize);
    };
-    resizer.addEventListener('mousedown', (e) => {
-      e.preventDefault();
+    resizer.addEventListener('mousedown', (event) => {
+      event.preventDefault();
      window.addEventListener('mousemove', resize);
      window.addEventListener('mouseup', stopResize);
    });
  });
 </script>

-<div class="h-full flex flex-col overflow-hidden">
+<div class="flex h-full flex-col overflow-hidden">
  <Navbar />
-  <div class="flex-1 flex overflow-hidden">
-    <div class="hidden md:flex flex-col" id="editorPane" style="width: 40%">
+  <div class="flex flex-1 overflow-hidden">
+    <div class="hidden flex-col md:flex" id="editorPane" style="width: 40%">
      <Card on:select={tabSelectHandler} {tabs} isCloseable={false} {activeTabID} title="Mermaid">
        <div slot="actions" class="flex flex-row items-center">
          <div class="form-control flex-row items-center">
-            <label class="cursor-pointer label" for="autoSync">
+            <label class="label cursor-pointer" for="autoSync">
              <span> Auto sync</span>
              <input
                type="checkbox"
@@ -155,15 +184,30 @@
      </div>
    </div>
    <div id="resizeHandler" class="hidden md:block" />
-    <div class="flex-1 flex flex-col overflow-hidden">
+    <div class="flex flex-1 flex-col overflow-hidden">
      <Card title="Diagram" isCloseable={false}>
        <div slot="actions" class="flex flex-row items-center gap-2">
-          <label class="cursor-pointer label py-0" for="panZoom">
+          <label
+            class="label flex cursor-pointer gap-1 py-0"
+            title="Rough mode is in beta. Features like clickable nodes, Pan & Zoom, will be disabled."
+            for="rough">
+            <span>Rough</span>
+            <input
+              type="checkbox"
+              class="toggle {$stateStore.rough ? 'btn-secondary' : 'toggle-primary'}"
+              id="rough"
+              bind:checked={$inputStateStore.rough} />
+          </label>
+          <label
+            class="label flex cursor-pointer gap-1 py-0"
+            title={$stateStore.rough ? 'Pan & Zoom is disabled in rough mode.' : ''}
+            for="panZoom">
            <span>Pan & Zoom</span>
            <input
              type="checkbox"
              class="toggle {$stateStore.panZoom ? 'btn-secondary' : 'toggle-primary'}"
              id="panZoom"
+              disabled={$stateStore.rough}
              bind:checked={$inputStateStore.panZoom} />
          </label>
          <a
@@ -176,7 +220,7 @@
            target="_blank"
            class="btn btn-secondary btn-xs gap-1 bg-[#FF3570]"
            title="Save diagram in Mermaid Chart"
-            ><img src="/mermaidchart-logo.svg" class="w-5 h-5" alt="Mermaid chart logo" />Save to
+            ><img src="./mermaidchart-logo.svg" class="h-5 w-5" alt="Mermaid chart logo" />Save to
            Mermaid Chart</a>
        </div>

@@ -184,7 +228,7 @@
          <View />
        </div>
      </Card>
-      <div class="md:hidden rounded shadow p-2 mx-2">
+      <div class="mx-2 rounded p-2 shadow md:hidden">
        Code editing not supported on mobile. Please use a desktop browser.
      </div>
    </div>
@@ -1,7 +1,5 @@
-import matchers from '@testing-library/jest-dom/matchers';
-import { expect, beforeAll, vi } from 'vitest';
-
-expect.extend(matchers);
+import 'vitest-dom/extend-expect';
+import { beforeAll, vi } from 'vitest';

 // TODO: Remove once https://github.com/sveltejs/kit/issues/6259 is closed.
 beforeAll(() => {