Merge branch 'develop' into sidv/asyncMonaco

* develop: (30 commits)
  chore(deps): update all non-major dependencies
  build: update Browserslist db
  fix Test
  chore(deps): update all non-major dependencies
  chore(deps): update node.js to v19
  chore(deps): update dependency jsdom to v21
  chore(deps): update actions/stale action to v8
  chore(deps): update all non-major dependencies
  Bump d3-color from 3.0.1 to 3.1.0
  Did it really work??
  Reduce timeouts
  Splitup tests
  cacheBust loadSite
  Reduce timeout & retries
  Update typeInEditor
  Fix commenting test
  Fix commenting test
  Fix loadSite ?
  Fix commenting test
  Fix branch test
  ...

.github/workflows/release-pr.yml

@@ -1,21 +0,0 @@
-name: Create release pull request
-on:
-  push:
-    branches:
-      - develop
-jobs:
-  productionPromotion:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: master
-      - name: Reset promotion branch
-        run: |
-          git fetch origin develop:develop
-          git reset --hard develop
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
-        with:
-          branch: release-promotion
-          title: Release live editor

.github/workflows/update-monaco-editor.yml

@@ -0,0 +1,25 @@
+name: Update Monaco-editor
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'dependabot/npm_and_yarn/develop/monaco-editor-**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - name: Update monaco version
+        run: |
+          yarn install
+          node ./bin/update-monaco.js
+      - name: Commit changes
+        uses: EndBug/add-and-commit@v9
+        with:
+          author_name: ${{ github.actor }}
+          author_email: ${{ github.actor }}@users.noreply.github.com
+          message: 'Update Monaco-editor'

Dockerfile

@@ -1,17 +1,17 @@
 # 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
+# Run                : docker run --name mermaid-live-editor --publish 8080:80 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 
+FROM node:19.9.0 as mermaid-live-editor-builder 
 COPY --chown=node:node . /home
 WORKDIR /home
 RUN yarn install
 RUN yarn build
 
-FROM nginxinc/nginx-unprivileged:alpine as mermaid-live-editor-runner
+FROM nginx:alpine as mermaid-live-editor-runner
 COPY ./nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=mermaid-live-editor-builder --chown=nginx:nginx /home/docs /usr/share/nginx/html

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM node:18.17.1
+FROM node:19
 WORKDIR /app
 COPY package.json .
 COPY yarn.lock .

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 - 2023 Knut Sveidqvist
+Copyright (c) 2020 - 2021 Knut Sveidqvist
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -24,7 +24,7 @@ You can try out a live version [here](https://mermaid.live/).
 ### Run published image
 
 ```bash
-docker run --platform linux/amd64 --publish 8000:8080 ghcr.io/mermaid-js/mermaid-live-editor
+docker run --publish 8000:80 ghcr.io/mermaid-js/mermaid-live-editor
 ```
 
 ### To configure renderer URL
@@ -43,7 +43,7 @@ Default is `https://kroki.io`
 docker compose up --build
 ```
 
-Then open http://localhost:3000
+Then open http://localhost:8000
 
 ## Setup
 

cypress/e2e/diagramUpdate.spec.ts

@@ -5,7 +5,6 @@ describe('Auto sync tests', () => {
     cy.clearLocalStorage();
     cy.visit('/');
     cy.url().should('contain', '/edit#pako');
-    cy.window().should('have.property', 'editorLoaded', true);
   });
 
   it('should dim diagram when code is edited', () => {
@@ -52,7 +51,7 @@ describe('Auto sync tests', () => {
 
   it('supports commenting code out/in', () => {
     cy.get('#editor').contains('Car').click();
-    cy.get('#editor').get('textarea').type(`${cmd}/`, { force: true });
+    cy.focused().type(`${cmd}/`);
     cy.get('#view').contains('Car').should('not.exist');
 
     typeInEditor(`{uparrow}${cmd}/`);

cypress/e2e/docMap.spec.ts

@@ -14,23 +14,23 @@ describe('Editor docs tests', () => {
 
   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$="/syntax/flowchart"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/#/flowchart"]`).should('exist');
 
     cy.contains('Config').click();
-    cy.get(`[data-cy=docs][href$="/syntax/flowchart?id=configuration"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/#/flowchart?id=configuration"]`).should('exist');
 
     cy.contains('Sequence').click();
-    cy.get(`[data-cy=docs][href$="/syntax/sequenceDiagram?id=configuration"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/#/sequenceDiagram?id=configuration"]`).should('exist');
 
     cy.contains('Code').click();
-    cy.get(`[data-cy=docs][href$="/syntax/sequenceDiagram"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/#/sequenceDiagram"]`).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$="/syntax/stateDiagram"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/#/stateDiagram"]`).should('exist');
 
     cy.contains('Config').click();
-    cy.get(`[data-cy=docs][href$="/syntax/stateDiagram"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/#/stateDiagram"]`).should('exist');
   });
 });

cypress/e2e/loadSite.spec.ts

@@ -13,12 +13,6 @@ describe('Site Loads', () => {
     cy.getLocalStorage('codeStore').snapshot();
   });
 
-  it('should keep code after reload', () => {
-    cy.get('#editor').contains('Car');
-    cy.reload();
-    cy.get('#editor').contains('Car');
-  });
-
   it('Check Redirect from old URL', () => {
     cy.visit(
       '/#/edit/eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl0iLCJtZXJtYWlkIjp7InRoZW1lIjoiZGVmYXVsdCJ9LCJ1cGRhdGVFZGl0b3IiOmZhbHNlfQ'

cypress/e2e/themes.spec.ts

@@ -12,7 +12,7 @@ describe('Test themes', () => {
             });
         }
       });
-      cy.contains('Theme').click();
+      cy.contains('Change Theme').click();
     });
 
     it('should set light theme as default', () => {
@@ -44,7 +44,7 @@ describe('Test themes', () => {
             });
         }
       });
-      cy.contains('Theme').click();
+      cy.contains('Change Theme').click();
     });
 
     it('should set dark theme as default', () => {

cypress/e2e/util.ts

@@ -9,17 +9,14 @@ export const typeInEditor = (
   text: string,
   { bottom = true, newline = false }: EditorOptions = {}
 ) => {
-  cy.window().should('have.property', 'editorLoaded', true);
   cy.get('#editor').click();
-  cy.get('#editor').within(($editor) => {
+  if (bottom) {
-    if (bottom) {
+    cy.focused().type('{pageDown}');
-      cy.get('textarea').type('{pageDown}', { force: true });
+  }
-    }
+  if (newline) {
-    if (newline) {
+    cy.focused().type('{enter}');
-      cy.get('textarea').type('{enter}', { force: true });
+  }
-    }
+  cy.focused().type(text);
-    cy.get('textarea').type(text, { force: true });
-  });
 };
 
 const downloadsFolder = Cypress.config('downloadsFolder');

cypress/snapshots.js

@@ -16,7 +16,7 @@ module.exports = {
       "1": "{\"code\":\"graph TD\\n    A[Party] -->|Get money| B(Go shopping!!)\\n    \",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"forest\\\",\\n  \\\"test\\\": \\\"hello world\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":true,\"loader\":{\"type\":\"files\",\"config\":{\"codeURL\":\"https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/code.mmd\",\"configURL\":\"https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/config.json\"}}}"
     }
   },
-  "__version": "12.17.4",
+  "__version": "12.9.0",
   "Auto sync tests": {
     "should dim diagram when code is edited": {
       "1": "{\"code\":\"flowchart TD\\n    A[Christmas] -->|Get money| B(Go shopping)\\n    B --> C{Let me think}\\n    C -->|One| D[Laptop]\\n    C -->|Two| E[iPhone]\\n    C -->|Three| F[fa:fa-car Car]\\n    C --> Test\",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":false,\"updateDiagram\":false}"

docker-compose.yml

@@ -7,5 +7,5 @@ services:
     volumes:
       - ./src:/app/src
     ports:
-      - 3000:3000
+      - 8080:8080
       - 24678:24678

nginx.conf

@@ -1,5 +1,5 @@
 server { 
- listen 8080;
+ listen 80;
  server_name mermaid;
  location / {
    root /usr/share/nginx/html;

package.json

@@ -23,62 +23,63 @@
   },
   "devDependencies": {
     "@cypress/snapshot": "2.1.7",
-    "@sveltejs/adapter-static": "2.0.3",
+    "@sveltejs/adapter-static": "2.0.2",
-    "@sveltejs/kit": "1.25.0",
+    "@sveltejs/kit": "1.15.7",
-    "@testing-library/jest-dom": "5.17.0",
+    "@testing-library/jest-dom": "5.16.5",
     "@testing-library/svelte": "3.2.2",
     "@types/pako": "2.0.0",
-    "@types/uuid": "9.0.4",
+    "@types/uuid": "9.0.1",
-    "@typescript-eslint/eslint-plugin": "5.62.0",
+    "@typescript-eslint/eslint-plugin": "5.58.0",
-    "@typescript-eslint/parser": "5.62.0",
+    "@typescript-eslint/parser": "5.58.0",
-    "@vitest/ui": "^0.34.0",
+    "@vitest/ui": "^0.30.1",
     "autoprefixer": "^10.4.14",
-    "c8": "7.14.0",
+    "c8": "7.13.0",
     "chai": "^4.3.7",
     "cssnano": "^6.0.0",
-    "cy-verify-downloads": "0.2.0",
+    "cy-verify-downloads": "0.1.14",
-    "cypress": "12.17.4",
+    "cypress": "12.9.0",
-    "cypress-localstorage-commands": "2.2.4",
+    "cypress-localstorage-commands": "2.2.3",
-    "eslint": "8.49.0",
+    "eslint": "8.38.0",
-    "eslint-config-prettier": "8.10.0",
+    "eslint-config-prettier": "8.8.0",
-    "eslint-plugin-cypress": "2.14.0",
+    "eslint-plugin-cypress": "2.13.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-tailwindcss": "3.11.0",
     "eslint-plugin-unicorn": "^46.0.0",
-    "eslint-plugin-vitest": "^0.3.0",
+    "eslint-plugin-vitest": "^0.1.4",
-    "esserializer": "1.3.11",
+    "esserializer": "1.3.10",
     "font-awesome": "^4.7.0",
     "husky": "^8.0.3",
-    "jsdom": "21.1.2",
+    "jsdom": "21.1.1",
-    "lint-staged": "13.3.0",
+    "lint-staged": "13.2.1",
     "node-html-parser": "^6.1.5",
     "postcss": "^8.4.21",
     "postcss-load-config": "4.0.1",
-    "prettier": "2.8.8",
+    "prettier": "2.8.7",
     "prettier-plugin-svelte": "^2.10.0",
-    "svelte": "3.59.2",
+    "svelte": "3.58.0",
-    "svelte-preprocess": "5.0.4",
+    "svelte-preprocess": "5.0.3",
     "tailwindcss": "^3.3.1",
     "tslib": "^2.5.0",
-    "typescript": "5.2.2",
+    "typescript": "5.0.4",
-    "vite": "^4.3.9",
+    "vite": "^4.2.1",
-    "vitest": "^0.34.0"
+    "vitest": "^0.30.1"
   },
   "dependencies": {
-    "analytics": "0.8.9",
+    "analytics": "0.8.1",
     "analytics-plugin-plausible": "0.0.6",
-    "daisyui": "2.52.0",
+    "daisyui": "2.51.5",
     "dayjs": "^1.11.7",
     "js-base64": "3.7.5",
-    "mermaid": "10.5.0",
+    "mermaid": "10.1.0",
-    "monaco-editor": "0.43.0",
+    "monaco-editor": "0.37.1",
+    "monaco-mermaid": "1.0.8",
     "pako": "2.1.0",
     "random-word-slugs": "0.1.7",
     "svg-pan-zoom": "3.6.1",
-    "uuid": "9.0.1"
+    "uuid": "9.0.0"
   },
   "lint-staged": {
     "*.{ts,svelte,js,css,md,json}": [
@@ -87,7 +88,7 @@
     ]
   },
   "volta": {
-    "node": "18.17.1",
+    "node": "18.16.0",
     "yarn": "1.22.19"
   },
   "engines": {

renovate.json

@@ -11,10 +11,6 @@
     ":automergePatch"
   ],
   "packageRules": [
-    {
-      "matchPackagePatterns": ["^mermaid"],
-      "groupName": "Mermaid packages"
-    },
     {
       "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
       "automerge": true

src/app.html

@@ -17,10 +17,41 @@
     <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"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"
-      integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA=="
+      integrity="sha512-iecdLmaskl7CVkqkXNQ/ZH/XLlvWZOJyj7Yy7tcenmpD1ypASozpmT/E0iPtmFIB46ZmdtAc9eNBvH0H/ZpiBw=="
       crossorigin="anonymous"
       referrerpolicy="no-referrer" />
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs/editor/editor.main.min.css"
+      integrity="sha512-wB3xfL98hWg1bpkVYSyL0js/Jx9s7FsDg9aYO6nOMSJTgPuk/PFqxXQJKKSUjteZjeYrfgo9NFBOA1r9HwDuZw=="
+      crossorigin="anonymous"
+      referrerpolicy="no-referrer" />
+    <script>
+      var require = {
+        paths: {
+          vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs'
+        }
+      };
+    </script>
+    <script
+      src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs/loader.min.js"
+      integrity="sha512-A+6SvPGkIN9Rf0mUXmW4xh7rDvALXf/f0VtOUiHlDUSPknu2kcfz1KzLpOJyL2pO+nZS13hhIjLqVgiQExLJrw=="
+      crossorigin="anonymous"
+      referrerpolicy="no-referrer"
+      async></script>
+    <script
+      src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs/editor/editor.main.nls.min.js"
+      integrity="sha512-rWneFgUi2AyxOdM2M4CqPQVSJOidtmUflUfKroRoxsX3qaQrXAZ17fiPXASJo12ta0RUO+lgQtRbEbRFaClJ6g=="
+      crossorigin="anonymous"
+      referrerpolicy="no-referrer"
+      async></script>
+    <script
+      src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs/editor/editor.main.js"
+      integrity="sha512-y99DgzNm8N3flFl0hvmTFfWVtj6prXGxll7PUbNc51mKGFiyWqTBqBFr06N8k7mLKp7LqvitwaIz8sJOfdHM4A=="
+      crossorigin="anonymous"
+      referrerpolicy="no-referrer"
+      async></script>
     %sveltekit.head%
   </head>
   <body>

src/lib/components/Editor.svelte

@@ -3,15 +3,14 @@
   import { stateStore, updateCode, updateConfig } from '$lib/util/state';
   import { themeStore } from '$lib/util/theme';
   import { errorDebug, syncDiagram } from '$lib/util/util';
-  import * as monaco from 'monaco-editor';
+  import type monaco from 'monaco-editor';
-  import monacoJsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker';
-  import monacoEditorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
   import { onMount } from 'svelte';
-  import { initEditor } from '$lib/util/monacoExtra';
+  import initEditor from 'monaco-mermaid';
   import { logEvent } from '$lib/util/stats';
 
   let divEl: HTMLDivElement | undefined = undefined;
   let editor: monaco.editor.IStandaloneCodeEditor | undefined;
+  let Monaco: typeof monaco | undefined;
   let editorOptions: monaco.editor.IStandaloneEditorConstructionOptions = {
     minimap: {
       enabled: false
@@ -23,7 +22,7 @@
 
   stateStore.subscribe(({ errorMarkers, editorMode, code, mermaid }) => {
     // console.log('editor store subscription', { code, mermaid });
-    if (!editor) {
+    if (!editor || !Monaco) {
       return;
     }
 
@@ -31,7 +30,6 @@
     const newText = editorMode === 'code' ? code : mermaid;
     if (newText !== text) {
       // console.log('updating editor text', newText);
-      editor.setScrollTop(0);
       editor.setValue(newText);
       text = newText;
     }
@@ -44,15 +42,15 @@
       return;
     }
     if (model.getLanguageId() !== language) {
-      monaco.editor.setModelLanguage(model, language);
+      Monaco.editor.setModelLanguage(model, language);
     }
 
     // Display/clear errors
-    monaco.editor.setModelMarkers(model, 'mermaid', errorMarkers);
+    Monaco.editor.setModelMarkers(model, 'mermaid', errorMarkers);
   });
 
   themeStore.subscribe(({ isDark }) => {
-    editor && monaco.editor.setTheme(isDark ? 'mermaid-dark' : 'mermaid');
+    editor && Monaco?.editor.setTheme(isDark ? 'mermaid-dark' : 'mermaid');
   });
 
   const handleUpdate = (text: string, mode: EditorMode) => {
@@ -64,23 +62,33 @@
     }
   };
 
-  onMount(async () => {
+  const loadMonaco = async () => {
-    self.MonacoEnvironment = {
+    console.log('Loading Monaco...');
-      getWorker(_, label) {
+    // errorDebug();
-        if (label === 'json') {
+    let i = 0;
-          return new monacoJsonWorker();
+    while (i++ < 500) {
-        }
+      // @ts-expect-error : This is a hack to handle a svelte-kit error when importing monaco.
-        return new monacoEditorWorker();
+      Monaco = window.monaco;
+      if (Monaco !== undefined) {
+        return;
       }
-    };
+      await new Promise((r) => setTimeout(r, 100));
+    }
+    alert('Loading Monaco Editor failed. Please try refreshing the page.');
+  };
 
+  onMount(async () => {
+    await loadMonaco(); // Fix https://github.com/mermaid-js/mermaid-live-editor/issues/175
+    if (!Monaco) {
+      throw new Error('Monaco failed to load');
+    }
     if (!divEl) {
       throw new Error('divEl is undefined');
     }
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    initEditor(monaco);
+    initEditor(Monaco);
     errorDebug(100);
-    editor = monaco.editor.create(divEl, editorOptions);
+    editor = Monaco.editor.create(divEl, editorOptions);
     editor.onDidChangeModelContent(({ isFlush, changes }) => {
       const newText = editor?.getValue();
       // console.log('editor onDidChangeModelContent', { text, newText, isFlush, changes });
@@ -93,17 +101,17 @@
     editor.addAction({
       id: 'mermaid-render-diagram',
       label: 'Render Diagram',
-      keybindings: [monaco.KeyMod.CtrlCmd | monaco.KeyCode.Enter],
+      keybindings: [Monaco.KeyMod.CtrlCmd | Monaco.KeyCode.Enter],
       run: function () {
         syncDiagram();
         logEvent('renderDiagram', {
-          method: 'keyboardShortcut'
+          method: 'keyboadShortcut'
         });
       }
     });
-    monaco.editor.setTheme($themeStore.isDark ? 'mermaid-dark' : 'mermaid');
+    Monaco.editor.setTheme($themeStore.isDark ? 'mermaid-dark' : 'mermaid');
     const resizeObserver = new ResizeObserver((entries) => {
-      editor?.layout({
+      editor!.layout({
         height: entries[0].contentRect.height,
         width: entries[0].contentRect.width
       });
@@ -112,12 +120,7 @@
     if (divEl.parentElement) {
       resizeObserver.observe(divEl.parentElement);
     }
-
+    // console.log(`editor mounted`);
-    // @ts-ignore
-    if (window.Cypress) {
-      // @ts-ignore
-      window.editorLoaded = true;
-    }
     return () => {
       // console.log(`editor disposed`);
       editor?.dispose();

src/lib/components/History/History.svelte

@@ -164,6 +164,7 @@
                   <a
                     href={url}
                     target="_blank"
+                    rel="noreferrer"
                     title="Open revision in new tab"
                     class="hover:underline text-blue-500">{name}</a>
                 {:else}

src/lib/components/History/history.test.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unnecessary-condition */
 import type { HistoryEntry } from '$lib/types';
 import { describe, it, expect } from 'vitest';
 import {

src/lib/components/History/history.ts

@@ -73,10 +73,10 @@ export const addHistoryEntry = (entryToAdd: Optional<HistoryEntry, 'id'>): void
       }
       return [entry, ...entries];
     });
+  } else if (entry.type === 'manual') {
+    manualHistoryStore.update((entries) => [entry, ...entries]);
+    logEvent('history', { action: 'save' });
   }
-
-  manualHistoryStore.update((entries) => [entry, ...entries]);
-  logEvent('history', { action: 'save' });
 };
 
 export const clearHistoryData = (idToClear?: string): void => {

src/lib/components/Navbar.svelte

@@ -18,11 +18,11 @@
   const links: Link[] = [
     {
       title: 'Documentation',
-      href: 'https://mermaid.js.org/intro/n00b-gettingStarted.html'
+      href: 'https://mermaid-js.github.io/mermaid/intro/n00b-gettingStarted.html'
     },
     {
       title: 'Tutorial',
-      href: 'https://mermaid.js.org/config/Tutorials.html'
+      href: 'https://mermaid-js.github.io/mermaid/config/Tutorials.html'
     },
     {
       title: 'Mermaid',
@@ -51,7 +51,7 @@
   </div>
   <label for="menu-toggle" class="pointer-cursor lg:hidden block"
     ><svg
-      class="fill-current"
+      class="fill-current "
       xmlns="http://www.w3.org/2000/svg"
       width="20"
       height="20"
@@ -65,7 +65,7 @@
     <ul class="lg:flex items-center justify-between text-base pt-4 lg:pt-0">
       {#each links as { title, href, icon, img }}
         <li>
-          <a class="btn btn-ghost" target="_blank" {href}>
+          <a class="btn btn-ghost" target="_blank" rel="noreferrer" {href}>
             {#if icon}
               <i class={icon} />
             {:else if img}

src/lib/components/Preset.svelte

@@ -101,21 +101,7 @@
             Argument mapping
     Tools
       Pen and paper
-      Mermaid`,
+      Mermaid`
-    QuadrantChart: `quadrantChart
-    title Reach and engagement of campaigns
-    x-axis Low Reach --> High Reach
-    y-axis Low Engagement --> High Engagement
-    quadrant-1 We should expand
-    quadrant-2 Need to promote
-    quadrant-3 Re-evaluate
-    quadrant-4 May be improved
-    Campaign A: [0.3, 0.6]
-    Campaign B: [0.45, 0.23]
-    Campaign C: [0.57, 0.69]
-    Campaign D: [0.78, 0.34]
-    Campaign E: [0.40, 0.34]
-    Campaign F: [0.35, 0.78]`
   };
 
   type SampleTypes = keyof typeof samples;
@@ -128,7 +114,7 @@
   };
 
   // Adding in this array will add an icon to the preset menu
-  const newDiagrams: SampleTypes[] = ['Mindmap', 'QuadrantChart'];
+  const newDiagrams: SampleTypes[] = ['Mindmap'];
   const diagramOrder: SampleTypes[] = [
     'Sequence',
     'Flow',
@@ -139,8 +125,7 @@
     'User Journey',
     'Git',
     'Pie',
-    'Mindmap',
+    'Mindmap'
-    'QuadrantChart'
   ];
 </script>
 

src/lib/components/Theme.svelte

@@ -28,7 +28,7 @@
 
 <div class="hidden lg:block dropdown">
   <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
-  <div tabindex="0" class="btn btn-ghost">
+  <div tabindex="0" class="btn btn-ghost ">
     <svg
       xmlns="http://www.w3.org/2000/svg"
       fill="none"
@@ -39,7 +39,7 @@
         stroke-linejoin="round"
         stroke-width="2"
         d="M7 21a4 4 0 01-4-4V5a2 2 0 012-2h4a2 2 0 012 2v12a4 4 0 01-4 4zm0 0h12a2 2 0 002-2v-4a2 2 0 00-2-2h-2.343M11 7.343l1.657-1.657a2 2 0 012.828 0l2.829 2.829a2 2 0 010 2.828l-8.486 8.485M7 17h.01" /></svg>
-    <span class="hidden md:inline">Theme</span>
+    <span class="hidden md:inline"> Change Theme </span>
     <svg
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 1792 1792"

src/lib/components/View.svelte

@@ -122,6 +122,7 @@
         pzoom.resize();
       }
     });
+    // console.log('View mounted');
   });
 </script>
 
@@ -129,7 +130,7 @@
   <div
     class="absolute w-full p-2 z-10 font-mono {error
       ? 'text-red-600'
-      : 'text-yellow-600'} bg-base-100 bg-opacity-80 text-left"
+      : 'text-yellow-600'} bg-base-100 bg-opacity-80 text-center"
     id="errorContainer">
     {#if error}
       {@html $stateStore.error?.toString().replace(/\n/g, '<br />')}

src/lib/util/monacoExtra.ts

@@ -1,621 +0,0 @@
-// Modified from https://github.com/Yash-Singh1/monaco-mermaid/blob/main/index.ts
-
-import type * as Monaco from 'monaco-editor';
-
-export const initEditor = (monacoEditor: typeof Monaco): void => {
-  monacoEditor.languages.register({ id: 'mermaid' });
-  const requirementDiagrams = [
-    'requirement',
-    'functionalRequirement',
-    'interfaceRequirement',
-    'performanceRequirement',
-    'physicalRequirement',
-    'designConstraint'
-  ];
-  const keywords: Record<
-    string,
-    {
-      typeKeywords: string[];
-      blockKeywords: string[];
-      keywords: string[];
-    }
-  > = {
-    flowchart: {
-      typeKeywords: ['flowchart', 'flowchart-v2', 'graph'],
-      blockKeywords: ['subgraph', 'end'],
-      keywords: [
-        'TB',
-        'TD',
-        'BT',
-        'RL',
-        'LR',
-        'click',
-        'call',
-        'href',
-        '_self',
-        '_blank',
-        '_parent',
-        '_top',
-        'linkStyle',
-        'style',
-        'classDef',
-        'class',
-        'direction',
-        'interpolate'
-      ]
-    },
-    sequenceDiagram: {
-      typeKeywords: ['sequenceDiagram'],
-      blockKeywords: ['alt', 'par', 'and', 'loop', 'else', 'end', 'rect', 'opt', 'alt', 'rect'],
-      keywords: [
-        'participant',
-        'as',
-        'Note',
-        'note',
-        'right of',
-        'left of',
-        'over',
-        'activate',
-        'deactivate',
-        'autonumber',
-        'title',
-        'actor',
-        'accDescription',
-        'link',
-        'links'
-      ]
-    },
-    classDiagram: {
-      typeKeywords: ['classDiagram', 'classDiagram-v2'],
-      blockKeywords: ['class'],
-      keywords: [
-        'link',
-        'click',
-        'callback',
-        'call',
-        'href',
-        'cssClass',
-        'direction',
-        'TB',
-        'BT',
-        'RL',
-        'LR',
-        'title',
-        'accDescription',
-        'order'
-      ]
-    },
-    stateDiagram: {
-      typeKeywords: ['stateDiagram', 'stateDiagram-v2'],
-      blockKeywords: ['state', 'note', 'end'],
-      keywords: ['state', 'as', 'hide empty description', 'direction', 'TB', 'BT', 'RL', 'LR']
-    },
-    erDiagram: {
-      typeKeywords: ['erDiagram'],
-      blockKeywords: [],
-      keywords: ['title', 'accDescription']
-    },
-    journey: {
-      typeKeywords: ['journey'],
-      blockKeywords: ['section'],
-      keywords: ['title']
-    },
-    info: {
-      typeKeywords: ['info'],
-      blockKeywords: [],
-      keywords: ['showInfo']
-    },
-    gantt: {
-      typeKeywords: ['gantt'],
-      blockKeywords: [],
-      keywords: [
-        'title',
-        'dateFormat',
-        'axisFormat',
-        'todayMarker',
-        'section',
-        'excludes',
-        'inclusiveEndDates'
-      ]
-    },
-    requirementDiagram: {
-      typeKeywords: ['requirement', 'requirementDiagram'],
-      blockKeywords: [...requirementDiagrams, 'element'],
-      keywords: []
-    },
-    gitGraph: {
-      typeKeywords: ['gitGraph'],
-      blockKeywords: [],
-      keywords: [
-        'accTitle',
-        'accDescr',
-        'commit',
-        'cherry-pick',
-        'branch',
-        'merge',
-        'reset',
-        'checkout',
-        'LR',
-        'BT',
-        'id',
-        'msg',
-        'type',
-        'tag',
-        'NORMAL',
-        'REVERSE',
-        'HIGHLIGHT'
-      ]
-    },
-    pie: {
-      typeKeywords: ['pie'],
-      blockKeywords: [],
-      keywords: ['showData', 'title', 'accDescr', 'accTitle']
-    },
-    c4Diagram: {
-      typeKeywords: ['C4Context', 'C4Container', 'C4Component', 'C4Dynamic', 'C4Deployment'],
-      blockKeywords: [
-        'Boundary',
-        'Enterprise_Boundary',
-        'System_Boundary',
-        'Container_Boundary',
-        'Node',
-        'Node_L',
-        'Node_R'
-      ],
-      keywords: [
-        'title',
-        'accDescription',
-        'direction',
-        'TB',
-        'BT',
-        'RL',
-        'LR',
-        'Person_Ext',
-        'Person',
-        'SystemQueue_Ext',
-        'SystemDb_Ext',
-        'System_Ext',
-        'SystemQueue',
-        'SystemDb',
-        'System',
-        'ContainerQueue_Ext',
-        'ContainerDb_Ext',
-        'Container_Ext',
-        'ContainerQueue',
-        'ContainerDb',
-        'Container',
-        'ComponentQueue_Ext',
-        'ComponentDb_Ext',
-        'Component_Ext',
-        'ComponentQueue',
-        'ComponentDb',
-        'Component',
-        'Deployment_Node',
-        'Rel',
-        'BiRel',
-        'Rel_Up',
-        'Rel_U',
-        'Rel_Down',
-        'Rel_D',
-        'Rel_Left',
-        'Rel_L',
-        'Rel_Right',
-        'Rel_R',
-        'Rel_Back',
-        'RelIndex'
-      ]
-    },
-    sankey: {
-      typeKeywords: ['sankey-beta'],
-      blockKeywords: [],
-      keywords: []
-    }
-  };
-
-  const configDirectiveHandler = [
-    /^\s*%%(?={)/,
-    {
-      token: 'string',
-      next: '@configDirective',
-      nextEmbedded: 'javascript'
-    }
-  ] as Monaco.languages.IShortMonarchLanguageRule1;
-
-  // Register a tokens provider for the mermaid language
-  monacoEditor.languages.setMonarchTokensProvider('mermaid', {
-    ...Object.entries(keywords)
-      .map((entry) =>
-        Object.fromEntries(
-          Object.entries(entry[1]).map((deepEntry) => [
-            entry[0] + deepEntry[0][0].toUpperCase() + deepEntry[0].slice(1),
-            deepEntry[1]
-          ])
-        )
-      )
-      // eslint-disable-next-line unicorn/no-array-reduce
-      .reduce(
-        (overallKeywords, nextKeyword) => ({
-          ...overallKeywords,
-          ...nextKeyword
-        }),
-        {}
-      ),
-    tokenizer: {
-      root: [
-        [/^\s*gitGraph/m, 'typeKeyword', 'gitGraph'],
-        [/^\s*info/m, 'typeKeyword', 'info'],
-        [/^\s*pie/m, 'typeKeyword', 'pie'],
-        [/^\s*(flowchart|flowchart-v2|graph)/m, 'typeKeyword', 'flowchart'],
-        [/^\s*sequenceDiagram/, 'typeKeyword', 'sequenceDiagram'],
-        [/^\s*classDiagram(-v2)?/, 'typeKeyword', 'classDiagram'],
-        [/^\s*journey/, 'typeKeyword', 'journey'],
-        [/^\s*gantt/, 'typeKeyword', 'gantt'],
-        [/^\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',
-          'c4Diagram'
-        ],
-        configDirectiveHandler,
-        [/%%[^${].*$/, 'comment']
-      ],
-      configDirective: [[/%%$/, { token: 'string', next: '@pop', nextEmbedded: '@pop' }]],
-      gitGraph: [
-        configDirectiveHandler,
-        [/option(?=s)/, { token: 'typeKeyword', next: 'optionsGitGraph' }],
-        [/(accTitle|accDescr)(\s*:)(\s*[^\n\r]+$)/, ['keyword', 'delimiter.bracket', 'string']],
-        [
-          /(^\s*branch)(.*?)(\s+order)(:\s*)(\d+\s*$)/,
-          ['keyword', 'variable', 'keyword', 'delimiter.bracket', 'number']
-        ],
-        [/".*?"/, 'string'],
-        [
-          /(^\s*)(branch|reset|merge|checkout)(\s*\S+)/m,
-          ['delimiter.bracket', 'keyword', 'variable']
-        ],
-        [
-          /[A-Za-z][\w$]*/,
-          {
-            cases: {
-              '@gitGraphBlockKeywords': 'typeKeyword',
-              '@gitGraphKeywords': 'keyword'
-            }
-          }
-        ],
-        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
-        [/\^/, 'delimiter.bracket']
-      ],
-      optionsGitGraph: [
-        [
-          /s$/,
-          {
-            token: 'typeKeyword',
-            nextEmbedded: 'json'
-          }
-        ],
-        ['end', { token: 'typeKeyword', next: '@pop', nextEmbedded: '@pop' }]
-      ],
-      info: [
-        [
-          /[A-Za-z][\w$]*/,
-          {
-            cases: {
-              '@infoBlockKeywords': 'typeKeyword',
-              '@infoKeywords': 'keyword'
-            }
-          }
-        ]
-      ],
-      pie: [
-        configDirectiveHandler,
-        [/(title|accDescription)(.*$)/, ['keyword', 'string']],
-        [
-          /[A-Za-z][\w$]*/,
-          {
-            cases: {
-              '@pieBlockKeywords': 'typeKeyword',
-              '@pieKeywords': 'keyword'
-            }
-          }
-        ],
-        [/".*?"/, 'string'],
-        [/\s*\d+/, 'number'],
-        [/:/, 'delimiter.bracket'],
-        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
-      ],
-      flowchart: [
-        configDirectiveHandler,
-        [/[ox]?(--+|==+)[ox]/, 'transition'],
-        [
-          /[A-Za-z][\w$]*/,
-          {
-            cases: {
-              '@flowchartBlockKeywords': 'typeKeyword',
-              '@flowchartKeywords': 'keyword',
-              '@default': 'variable'
-            }
-          }
-        ],
-        [/\|+.+?\|+/, 'string'],
-        [/\[+(\\.+?[/\\]|\/.+?[/\\])]+/, 'string'],
-        [/[>[]+[^[\]|]+?]+/, 'string'],
-        [/{+.+?}+/, 'string'],
-        [/\(+.+?\)+/, 'string'],
-        [/-\.+->?/, 'transition'],
-        [/(-[.-])([^>-][^-]+?)(-{3,}|-{2,}>|\.-+>)/, ['transition', 'string', 'transition']],
-        [/(==+)([^=]+?)(={3,}|={2,}>)/, ['transition', 'string', 'transition']],
-        [/<?(--+|==+)>|===+|---+/, 'transition'],
-        [/:::/, 'transition'],
-        [/[&;]/, 'delimiter.bracket'],
-        [/".*?"/, 'string'],
-        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
-      ],
-      sequenceDiagram: [
-        configDirectiveHandler,
-        [/(title:?|accDescription)([^\n\r;]*$)/, ['keyword', 'string']],
-        [/(autonumber)([^\S\n\r]+off[^\S\n\r]*$)/, ['keyword', 'keyword']],
-        [/(autonumber)((?:[^\S\n\r]+\d+){2}[^\S\n\r]*$)/, ['keyword', 'number']],
-        [/(autonumber)([^\S\n\r]+\d+[^\S\n\r]*$)/, ['keyword', 'number']],
-        [
-          /(link\s+)(.*?)(:)(\s*.*?)(\s*@)(\s*[^\n\r;]+)/,
-          ['keyword', 'variable', 'delimiter.bracket', 'string', 'delimiter.bracket', 'string']
-        ],
-        [
-          /((?:links|properties)\s+)([^\n\r:]*?)(:\s+)/,
-          [
-            { token: 'keyword' },
-            { token: 'variable' },
-            {
-              token: 'delimiter.bracket',
-              nextEmbedded: 'javascript',
-              next: '@sequenceDiagramLinksProps'
-            }
-          ]
-        ],
-        [
-          /[A-Za-z][\w$]*/,
-          {
-            cases: {
-              '@sequenceDiagramBlockKeywords': 'typeKeyword',
-              '@sequenceDiagramKeywords': 'keyword',
-              '@default': 'variable'
-            }
-          }
-        ],
-        [/(--?>?>|--?[)x])[+-]?/, 'transition'],
-        [/(:)([^\n:]*?$)/, ['delimiter.bracket', 'string']],
-        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
-      ],
-      sequenceDiagramLinksProps: [
-        // [/^:/, { token: 'delimiter.bracket', nextEmbedded: 'json' }],
-        [/$|;/, { nextEmbedded: '@pop', next: '@pop', token: 'delimiter.bracket' }]
-      ],
-      classDiagram: [
-        configDirectiveHandler,
-        [/(^\s*(?:title|accDescription))(\s+.*$)/, ['keyword', 'string']],
-        [
-          /(\*|<\|?|o|)(--|\.\.)(\*|\|?>|o|)([\t ]*[A-Za-z]+[\t ]*)(:)(.*?$)/,
-          ['transition', 'transition', 'transition', 'variable', 'delimiter.bracket', 'string']
-        ],
-        [/(?!class\s)([A-Za-z]+)(\s+[A-Za-z]+)/, ['type', 'variable']],
-        [/(\*|<\|?|o)?(--|\.\.)(\*|\|?>|o)?/, 'transition'],
-        [/^\s*class\s(?!.*{)/, 'keyword'],
-        [
-          /[A-Za-z][\w$]*/,
-          {
-            cases: {
-              '@classDiagramBlockKeywords': 'typeKeyword',
-              '@classDiagramKeywords': 'keyword',
-              '@default': 'variable'
-            }
-          }
-        ],
-        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
-        [/(<<)(.+?)(>>)/, ['delimiter.bracket', 'annotation', 'delimiter.bracket']],
-        [/".*?"/, 'string'],
-        [/:::/, 'transition'],
-        [/:|\+|-|#|~|\*\s*$|\$\s*$|\(|\)|{|}/, 'delimiter.bracket']
-      ],
-      journey: [
-        configDirectiveHandler,
-        [/(title)(.*)/, ['keyword', 'string']],
-        [/(section)(.*)/, ['typeKeyword', 'string']],
-        [
-          /[A-Za-z][\w$]*/,
-          {
-            cases: {
-              '@journeyBlockKeywords': 'typeKeyword',
-              '@journeyKeywords': 'keyword',
-              '@default': 'variable'
-            }
-          }
-        ],
-        [
-          /(^\s*.+?)(:)(.*?)(:)(.*?)([$,])/,
-          [
-            'string',
-            'delimiter.bracket',
-            'number',
-            'delimiter.bracket',
-            'variable',
-            'delimiter.bracket'
-          ]
-        ],
-        [/,/, 'delimiter.bracket'],
-        [/(^\s*.+?)(:)([^:]*?)$/, ['string', 'delimiter.bracket', 'variable']],
-        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
-      ],
-      gantt: [
-        configDirectiveHandler,
-        [/(title)(.*)/, ['keyword', 'string']],
-        [/(section)(.*)/, ['typeKeyword', 'string']],
-        [/^\s*([^\n:]*?)(:)/, ['string', 'delimiter.bracket']],
-        [
-          /[A-Za-z][\w$]*/,
-          {
-            cases: {
-              '@ganttBlockKeywords': 'typeKeyword',
-              '@ganttKeywords': 'keyword'
-            }
-          }
-        ],
-        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
-        [/:/, 'delimiter.bracket']
-      ],
-      stateDiagram: [
-        configDirectiveHandler,
-        [/note[^:]*$/, { token: 'typeKeyword', next: 'stateDiagramNote' }],
-        ['hide empty description', 'keyword'],
-        [/^\s*state\s(?!.*{)/, 'keyword'],
-        [/(<<)(fork|join|choice)(>>)/, 'annotation'],
-        [/(\[\[)(fork|join|choice)(]])/, ['delimiter.bracket', 'annotation', 'delimiter.bracket']],
-        [
-          /[A-Za-z][\w$]*/,
-          {
-            cases: {
-              '@stateDiagramBlockKeywords': 'typeKeyword',
-              '@stateDiagramKeywords': 'keyword',
-              '@default': 'variable'
-            }
-          }
-        ],
-        [/".*?"/, 'string'],
-        [/(:)([^\n:]*?$)/, ['delimiter.bracket', 'string']],
-        [/{|}/, 'delimiter.bracket'],
-        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
-        [/-->/, 'transition'],
-        [/\[.*?]/, 'string']
-      ],
-      stateDiagramNote: [
-        [/^\s*end note$/, { token: 'typeKeyword', next: '@pop' }],
-        [/.*/, 'string']
-      ],
-      erDiagram: [
-        configDirectiveHandler,
-        [/(title|accDescription)(.*$)/, ['keyword', 'string']],
-        [/[|}][o|](--|\.\.)[o|][{|]/, 'transition'],
-        [/".*?"/, 'string'],
-        [/(:)(.*?$)/, ['delimiter.bracket', 'string']],
-        [/[:{}]/, 'delimiter.bracket'],
-        [/([A-Za-z]+)(\s+[A-Za-z]+)/, ['type', 'variable']],
-        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
-        [/[A-Z_a-z-][\w$]*/, 'variable']
-      ],
-      requirementDiagram: [
-        configDirectiveHandler,
-        [/->|<-|-/, 'transition'],
-        [/(\d+\.)*\d+/, 'number'],
-        [
-          /[A-Z_a-z-][\w$]*/,
-          {
-            cases: {
-              '@requirementDiagramBlockKeywords': 'typeKeyword',
-              '@default': 'variable'
-            }
-          }
-        ],
-        [/[/:{}]/, 'delimiter.bracket'],
-        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
-        [/".*?"/, 'string']
-      ],
-      c4Diagram: [
-        configDirectiveHandler,
-        [/(title|accDescription)(.*$)/, ['keyword', 'string']],
-        [/\(/, { token: 'delimiter.bracket', next: 'c4DiagramParenthesis' }],
-        [
-          /[A-Z_a-z-][\w$]*/,
-          {
-            cases: {
-              '@c4DiagramBlockKeywords': 'typeKeyword',
-              '@c4DiagramKeywords': 'keyword',
-              '@default': 'variable'
-            }
-          }
-        ],
-        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
-      ],
-      c4DiagramParenthesis: [
-        [/,/, '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']
-      ]
-    }
-  });
-
-  monacoEditor.editor.defineTheme('mermaid-dark', {
-    base: 'vs-dark',
-    inherit: true,
-    colors: {},
-    rules: [
-      { token: 'typeKeyword', foreground: '9650c8', fontStyle: 'bold' },
-      { token: 'transition', foreground: '008800', fontStyle: 'bold' },
-      { token: 'identifier', foreground: '9cdcfe' }
-    ]
-  });
-
-  monacoEditor.editor.defineTheme('mermaid', {
-    base: 'vs',
-    inherit: true,
-    colors: {},
-    rules: [
-      { token: 'typeKeyword', foreground: '9650c8', fontStyle: 'bold' },
-      { token: 'keyword', foreground: '649696' },
-      { token: 'custom-error', foreground: 'ff0000', fontStyle: 'bold' },
-      { token: 'string', foreground: 'AA8500' },
-      { token: 'transition', foreground: '008800', fontStyle: 'bold' },
-      { token: 'delimiter.bracket', foreground: '000000', fontStyle: 'bold' },
-      { token: 'annotation', foreground: '4b4b96' },
-      { token: 'number', foreground: '4b4b96' },
-      { token: 'comment', foreground: '888c89' },
-      { token: 'variable', foreground: 'A22889' },
-      { token: 'type', foreground: '2BDEA8' },
-      { token: 'identifier', foreground: '9cdcfe' }
-    ]
-  });
-
-  monacoEditor.languages.registerCompletionItemProvider('mermaid', {
-    provideCompletionItems: () => {
-      return {
-        suggestions: []
-      };
-    }
-  });
-
-  monacoEditor.languages.setLanguageConfiguration('mermaid', {
-    autoClosingPairs: [
-      {
-        open: '(',
-        close: ')'
-      },
-      {
-        open: '{',
-        close: '}'
-      },
-      {
-        open: '[',
-        close: ']'
-      }
-    ],
-    brackets: [
-      ['(', ')'],
-      ['{', '}'],
-      ['[', ']']
-    ],
-    comments: {
-      lineComment: '%%'
-    }
-  });
-};

src/lib/util/stats.ts

@@ -15,8 +15,8 @@ export const initAnalytics = async (): Promise<void> => {
           plausible({
             domain: 'mermaid.live',
             hashMode: false,
-            // All tracked stats are public and available at https://p.mermaid.live/mermaid.live
+            trackLocalhost: false, // By default 'false'
-            apiHost: 'https://p.mermaid.live'
+            apiHost: 'https://plausible.io'
           })
         ]
       });
@@ -37,9 +37,7 @@ export const detectType = (text: string): string | undefined => {
     'graph',
     'journey',
     'pie',
-    'stateDiagram',
+    'stateDiagram'
-    'quadrantChart',
-    'mindmap'
   ];
   const firstLine = text
     .replace(/^\s*%%.*\n/g, '\n')
@@ -60,27 +58,7 @@ export const saveStatistics = (graph: string): void => {
     return;
   }
   const length = countLines(graph);
-  const lengthBucket =
+  logEvent('render', { graphType, length });
-    length < 10
-      ? '0-10'
-      : length < 25
-      ? '10-25'
-      : length < 50
-      ? '25-50'
-      : length < 100
-      ? '50-100'
-      : length < 200
-      ? '100-200'
-      : length < 500
-      ? '200-500'
-      : length < 700
-      ? '500-700'
-      : length < 1000
-      ? '700-1000'
-      : length < 1500
-      ? '1000-1500'
-      : '1500+';
-  logEvent('render', { graphType, length, lengthBucket });
 };
 
 const minutesToMilliSeconds = (minutes: number): number => {

src/routes/edit/+page.svelte

@@ -9,56 +9,47 @@
   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';
+  import { base } from '$app/paths';
 
-  const MCBaseURL = dev ? 'http://localhost:5174' : 'https://mermaidchart.com';
   const docURLBase = 'https://mermaid-js.github.io/mermaid';
   const docMap: DocumentationConfig = {
-    classDiagram: {
+    graph: {
-      code: '/syntax/classDiagram',
+      code: '/#/flowchart',
-      config: '/syntax/classDiagram#configuration'
+      config: '/#/flowchart?id=configuration'
-    },
-    erDiagram: {
-      code: '/syntax/entityRelationshipDiagram'
     },
     flowchart: {
-      code: '/syntax/flowchart',
+      code: '/#/flowchart',
-      config: '/syntax/flowchart#configuration'
+      config: '/#/flowchart?id=configuration'
-    },
-    gantt: {
-      code: '/syntax/gantt',
-      config: '/syntax/gantt#configuration'
-    },
-    gitGraph: {
-      code: '/syntax/gitgraph',
-      config: '/syntax/gitgraph#gitgraph-specific-configuration-options'
-    },
-    graph: {
-      code: '/syntax/flowchart',
-      config: '/syntax/flowchart#configuration'
-    },
-    journey: {
-      code: '/syntax/userJourney'
-    },
-    mindmap: {
-      code: '/syntax/mindmap'
-    },
-    pie: {
-      code: '/syntax/pie',
-      config: '/syntax/pie#configuration'
-    },
-    quadrantChart: {
-      code: '/syntax/quadrantChart',
-      config: '/syntax/quadrantChart#chart-configurations'
     },
     sequenceDiagram: {
-      code: '/syntax/sequenceDiagram',
+      code: '/#/sequenceDiagram',
-      config: '/syntax/sequenceDiagram#configuration'
+      config: '/#/sequenceDiagram?id=configuration'
+    },
+    classDiagram: {
+      code: '/#/classDiagram',
+      config: '/#/classDiagram?id=configuration'
     },
     'stateDiagram-v2': {
-      code: '/syntax/stateDiagram'
+      code: '/#/stateDiagram'
+    },
+    gantt: {
+      code: '/#/gantt',
+      config: '/#/gantt?id=configuration'
+    },
+    pie: {
+      code: '/#/pie'
+    },
+    erDiagram: {
+      code: '/#/entityRelationshipDiagram',
+      config: '/#/entityRelationshipDiagram?id=styling'
+    },
+    journey: {
+      code: '/#/user-journey'
+    },
+    gitGraph: {
+      code: '/#/gitgraph',
+      config: '/#/gitgraph?id=gitgraph-specific-configuration-options'
     }
   };
   let docURL = docURLBase;
@@ -146,7 +137,7 @@
           <button
             class="btn btn-secondary btn-xs"
             title="View documentation for {docKey.replace('Diagram', '')} diagram">
-            <a target="_blank" href={docURL} data-cy="docs">
+            <a target="_blank" rel="noreferrer" href={docURL} data-cy="docs">
               <i class="fas fa-book mr-1" />Docs
             </a>
           </button>
@@ -164,27 +155,22 @@
     <div id="resizeHandler" class="hidden md:block" />
     <div class="flex-1 flex flex-col overflow-hidden">
       <Card title="Diagram" isCloseable={false}>
-        <div slot="actions" class="flex flex-row items-center gap-2">
+        <div slot="actions" class="flex flex-row items-center">
           <label class="cursor-pointer label py-0" for="panZoom">
             <span>Pan & Zoom</span>
             <input
               type="checkbox"
-              class="toggle {$stateStore.panZoom ? 'btn-secondary' : 'toggle-primary'}"
+              class="toggle {$stateStore.panZoom ? 'btn-secondary' : 'toggle-primary'} ml-1"
               id="panZoom"
               bind:checked={$inputStateStore.panZoom} />
           </label>
           <a
             href={`${base}/view#${$stateStore.serialized}`}
             target="_blank"
-            class="btn btn-secondary btn-xs gap-1"
+            rel="noreferrer"
-            title="View diagram in new page"><i class="fas fa-external-link-alt" />Full screen</a>
+            class="btn btn-secondary btn-xs"
-          <a
+            title="View diagram in new page"
-            href={`${MCBaseURL}/app/plugin/save?state=${$stateStore.serialized}`}
+            ><i class="fas fa-external-link-alt mr-1" />Full screen</a>
-            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
-            Mermaid Chart</a>
         </div>
 
         <div class="flex-1 overflow-auto">