feat: New diagrams

* master:
  chore(deps): update all non-major dependencies
  chore(deps): update dependency node-html-parser to v6
  chore(deps): update dependency font-awesome to v6
  chore(deps): update actions/setup-node action to v3
  fix(deps): pin dependency analytics-plugin-plausible to 0.0.6

.eslintrc.cjs

@@ -44,7 +44,6 @@ module.exports = {
 		],
 		'@typescript-eslint/no-unsafe-member-access': 'off',
 		'@typescript-eslint/no-unsafe-assignment': 'off',
-		'es/no-regexp-lookbehind-assertions': 'error',
-		curly: ['error', 'all']
+		'es/no-regexp-lookbehind-assertions': 'error'
 	}
 };

.github/workflows/tests.yml

@@ -48,3 +48,4 @@ jobs:
           parallel: true
         env:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+          MERMAID_DISABLE_DEBOUNCE: 'true'

.github/workflows/update-browserlist.yml

@@ -1,9 +1,10 @@
 name: Update Browserslist
 on:
+  workflow_dispatch:
   push:
-    branches-ignore:
-      - 'develop'
-      - 'master'
+    branches:
+      - develop
+
 jobs:
   build:
     runs-on: ubuntu-latest

.vscode/settings.json

@@ -4,6 +4,5 @@
 	"vitest.commandLine": "yarn test:unit",
 	"vitest.enable": true,
 	"testing.autoRun.mode": "rerun",
-	"svelte.enable-ts-plugin": true,
-	"githubPullRequests.ignoredPullRequestBranches": ["develop"]
+	"svelte.enable-ts-plugin": true
 }

Dockerfile

@@ -6,7 +6,7 @@
 # Stop               : press ctrl + c 
 #                                     or 
 #                                        docker stop mermaid-live-editor
-FROM node:18.10.0 as mermaid-live-editor-builder 
+FROM node:18.9.0 as mermaid-live-editor-builder 
 COPY --chown=node:node . /home
 WORKDIR /home
 RUN yarn install

cypress/e2e/actions.spec.ts

@@ -35,7 +35,7 @@ describe('Check actions', () => {
 
 		// Verify downloaded file is different for different diagrams
 		cy.contains('Sample Diagrams').click();
-		cy.contains('ER Diagram').click();
+		cy.contains('ER').click();
 
 		cy.get(`#downloadPNG`).click();
 		verifyFileSize('diagram', 'png', 46_000);

cypress/e2e/diagramUpdate.spec.ts

@@ -9,10 +9,8 @@ describe('Auto sync tests', () => {
 	it('should dim diagram when code is edited', () => {
 		cy.contains('Auto sync').click();
 		cy.get('#view').should('not.have.class', 'outOfSync');
-		cy.get('#view').should('not.contain.text', 'Diagram out of sync.');
 		getEditor().type('  C --> Test');
 		cy.get('#view').should('have.class', 'outOfSync');
-		cy.get('#view').should('contain.text', 'Diagram out of sync.');
 		cy.getLocalStorage('codeStore').snapshot();
 	});
 
@@ -21,9 +19,7 @@ describe('Auto sync tests', () => {
 		cy.get('#view').should('not.have.class', 'outOfSync');
 		getEditor().type('  C --> Test');
 		cy.get('#view').should('have.class', 'outOfSync');
-		cy.get('#view').should('contain.text', 'Diagram out of sync.');
 		getEditor().type(`${cmd}{enter}`);
-		cy.get('#view').should('not.contain.text', 'Diagram out of sync.');
 		cy.get('#view').should('not.have.class', 'outOfSync');
 	});
 

cypress/e2e/docMap.spec.ts

@@ -13,13 +13,13 @@ describe('Editor docs tests', () => {
 	});
 
 	it('Test to see if the correct URL loads when changing from one diagram to other', () => {
-		cy.contains('Flow Chart').click();
+		cy.contains('Flow').click();
 		cy.get(`[data-cy=docs][href$="/#/flowchart"]`).should('exist');
 
 		cy.contains('Config').click();
 		cy.get(`[data-cy=docs][href$="/#/flowchart?id=configuration"]`).should('exist');
 
-		cy.contains('Sequence Diagram').click();
+		cy.contains('Sequence').click();
 		cy.get(`[data-cy=docs][href$="/#/sequenceDiagram?id=configuration"]`).should('exist');
 
 		cy.contains('Code').click();
@@ -27,7 +27,7 @@ describe('Editor docs tests', () => {
 	});
 
 	it("Test to check URLs for a case where config URL doesn't exist", () => {
-		cy.contains('State Diagram').click();
+		cy.contains('State').click();
 		cy.get(`[data-cy=docs][href$="/#/stateDiagram"]`).should('exist');
 
 		cy.contains('Config').click();

cypress/e2e/loadSite.spec.ts

@@ -20,9 +20,9 @@ describe('Site Loads', () => {
 
 	it('should load sample diagrams when clicked', () => {
 		cy.contains('Sample Diagrams').click();
-		cy.contains('Pie Chart').click();
+		cy.contains('Pie').click();
 		cy.contains('pie title Pets adopted by volunteers');
-		cy.contains('Class Diagram').click();
+		cy.contains('Class').click();
 		cy.contains('classDiagram');
 	});
 

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": "10.6.0",
+  "__version": "10.7.0",
   "Auto sync tests": {
     "should dim diagram when code is edited": {
       "1": "{\"code\":\"graph 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}"

package.json

@@ -5,8 +5,7 @@
 	"license": "MIT",
 	"scripts": {
 		"dev": "vite dev",
-		"dev:force": "MERMAID_LOCAL=true yarn dev --force",
-		"dev:test": "yarn dev",
+		"dev:test": "MERMAID_DISABLE_DEBOUNCE=true yarn dev",
 		"build": "vite build",
 		"preview": "vite preview",
 		"lint": "prettier --check --cache --plugin-search-dir=. .;eslint --ignore-path .gitignore .",
@@ -23,53 +22,54 @@
 	},
 	"devDependencies": {
 		"@cypress/snapshot": "2.1.7",
-		"@sveltejs/adapter-static": "1.0.0-next.44",
-		"@sveltejs/kit": "1.0.0-next.511",
+		"@sveltejs/adapter-static": "1.0.0-next.42",
+		"@sveltejs/kit": "1.0.0-next.480",
 		"@testing-library/jest-dom": "5.16.5",
-		"@testing-library/svelte": "3.2.2",
+		"@testing-library/svelte": "3.2.1",
 		"@types/pako": "2.0.0",
 		"@types/uuid": "8.3.4",
-		"@typescript-eslint/eslint-plugin": "5.39.0",
-		"@typescript-eslint/parser": "5.39.0",
-		"@vitest/ui": "0.24.0",
-		"autoprefixer": "10.4.12",
+		"@typescript-eslint/eslint-plugin": "5.36.2",
+		"@typescript-eslint/parser": "5.36.2",
+		"@vitest/ui": "0.23.1",
+		"autoprefixer": "10.4.8",
 		"c8": "7.12.0",
 		"chai": "4.3.6",
 		"cssnano": "5.1.13",
-		"cy-verify-downloads": "0.1.11",
-		"cypress": "10.9.0",
+		"cy-verify-downloads": "0.1.8",
+		"cypress": "10.7.0",
 		"cypress-localstorage-commands": "2.2.1",
-		"eslint": "8.25.0",
+		"eslint": "8.23.0",
 		"eslint-config-prettier": "8.5.0",
 		"eslint-plugin-cypress": "2.12.1",
 		"eslint-plugin-es": "4.1.0",
 		"eslint-plugin-postcss-modules": "2.0.0",
 		"eslint-plugin-svelte3": "4.0.0",
-		"eslint-plugin-tailwindcss": "3.6.2",
+		"eslint-plugin-tailwindcss": "3.6.1",
 		"eslint-plugin-vitest": "0.0.8",
 		"esserializer": "1.3.2",
 		"husky": "8.0.1",
-		"jsdom": "20.0.1",
+		"jsdom": "20.0.0",
 		"lint-staged": "13.0.3",
-		"node-html-parser": "6.1.1",
-		"postcss": "8.4.17",
+		"node-html-parser": "6.0.0",
+		"postcss": "8.4.16",
 		"postcss-load-config": "4.0.1",
 		"prettier": "2.7.1",
-		"prettier-plugin-svelte": "2.8.0",
+		"prettier-plugin-svelte": "2.7.0",
 		"svelte": "3.50.1",
 		"svelte-preprocess": "4.10.7",
 		"tailwindcss": "3.1.8",
 		"tslib": "2.4.0",
-		"typescript": "4.8.4",
-		"vite": "3.1.7",
-		"vitest": "0.24.0"
+		"typescript": "4.8.3",
+		"vite": "3.1.0",
+		"vitest": "0.23.1"
 	},
 	"dependencies": {
+		"@analytics/google-analytics": "1.0.3",
 		"analytics": "0.8.1",
 		"analytics-plugin-plausible": "0.0.6",
-		"daisyui": "2.31.0",
+		"daisyui": "2.25.0",
 		"js-base64": "3.7.2",
-		"mermaid": "9.2.0-rc6",
+		"mermaid": "9.2.0-rc1",
 		"moment": "2.29.4",
 		"monaco-editor": "0.34.0",
 		"monaco-mermaid": "1.0.6",

renovate.json

@@ -14,6 +14,10 @@
 		{
 			"matchUpdateTypes": ["minor", "patch", "pin", "digest"],
 			"automerge": true
+		},
+		{
+			"matchDatasources": ["npm"],
+			"stabilityDays": 3
 		}
 	],
 	"dependencyDashboard": true,

src/app.html

@@ -11,9 +11,7 @@
 		<meta
 			name="description"
 			content="Simplify documentation and avoid heavy tools. Open source Visio Alternative. Commonly used for explaining your code! Mermaid is a simple markdown-like script language for generating charts from text via javascript." />
-		<link rel="icon" type="image/png" href="%sveltekit.assets%/favicon.svg" />
-		<link rel="mask-icon" href="%sveltekit.assets%/favicon.svg" color="#000000" />
-		<meta name="theme-color" content="#6366F1" />
+		<link rel="icon" type="image/png" href="%sveltekit.assets%/favicon.png" />
 		<link rel="manifest" href="%sveltekit.assets%/manifest.json" />
 		<link
 			rel="stylesheet"
@@ -30,8 +28,8 @@
 		<script>
 			var require = {
 				paths: {
-					vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs'
-				}
+					vs: "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs",
+				},
 			};
 		</script>
 		<script

src/env.d.ts

@@ -1,14 +0,0 @@
-/// <reference types="vite/client" />
-
-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;
-	// more env variables...
-}
-
-interface ImportMeta {
-	readonly env: ImportMetaEnv;
-}

src/lib/components/actions.svelte

@@ -1,13 +1,12 @@
 <script lang="ts">
 	import { browser } from '$app/environment';
 	import Card from '$lib/components/card/card.svelte';
-	import { env } from '$lib/util/env';
+	import { krokiRendererUrl, rendererUrl } 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 moment from 'moment';
-	const { krokiRendererUrl, rendererUrl } = env;
 
 	type Exporter = (context: CanvasRenderingContext2D, image: HTMLImageElement) => () => void;
 
@@ -116,19 +115,19 @@
 
 	const onCopyClipboard = (event: Event) => {
 		exportImage(event, clipboardCopy);
-		logEvent('copyClipboard');
+		void logEvent('copyClipboard');
 	};
 
 	const onDownloadPNG = (event: Event) => {
 		exportImage(event, downloadImage);
-		logEvent('download', {
+		void logEvent('download', {
 			type: 'png'
 		});
 	};
 
 	const onDownloadSVG = () => {
 		simulateDownload(getFileName('svg'), `data:image/svg+xml;base64,${getBase64SVG()}`);
-		logEvent('download', {
+		void logEvent('download', {
 			type: 'svg'
 		});
 	};
@@ -136,7 +135,7 @@
 	const onCopyMarkdown = () => {
 		(document.getElementById('markdown') as HTMLInputElement).select();
 		document.execCommand('Copy');
-		logEvent('copyMarkdown');
+		void logEvent('copyMarkdown');
 	};
 
 	let gistURL = '';
@@ -152,7 +151,7 @@
 			alert('Please enter a Gist URL first');
 		}
 		window.location.href = `${window.location.pathname}?gist=${gistURL}`;
-		logEvent('loadGist');
+		void logEvent('loadGist');
 	};
 
 	let iUrl: string;
@@ -167,7 +166,7 @@
 		isNetlify = true;
 	}
 	stateStore.subscribe(({ code, serialized }) => {
-		iUrl = `${rendererUrl}/img/${serialized}?type=png`;
+		iUrl = `${rendererUrl}/img/${serialized}`;
 		svgUrl = `${rendererUrl}/svg/${serialized}`;
 		krokiUrl = `${krokiRendererUrl}/mermaid/svg/${pakoSerde.serialize(code)}`;
 		mdCode = `[![](${iUrl})](${window.location.protocol}//${window.location.host}${window.location.pathname}#${serialized})`;
@@ -181,24 +180,26 @@
 				><i class="far fa-copy mr-2" /> Copy Image to clipboard
 			</button>
 		{/if}
-		<button id="downloadPNG" class="action-btn flex-grow" on:click={onDownloadPNG}>
+		<button id="downloadPNG" class="action-btn flex-auto" on:click={onDownloadPNG}>
 			<i class="fas fa-download mr-2" /> PNG
 		</button>
-		<button id="downloadSVG" class="action-btn flex-grow" on:click={onDownloadSVG}>
+		<button id="downloadSVG" class="action-btn flex-auto" on:click={onDownloadSVG}>
 			<i class="fas fa-download mr-2" /> SVG
 		</button>
-		<a target="_blank" class="flex-grow" href={iUrl}>
-			<button class="action-btn w-full">
+		<a target="_blank" href={iUrl}>
+			<button class="action-btn flex-auto">
 				<i class="fas fa-external-link-alt mr-2" /> PNG
 			</button>
 		</a>
-		<a target="_blank" class="flex-grow" href={svgUrl}>
-			<button class="action-btn w-full">
+
+		<a target="_blank" href={svgUrl}>
+			<button class="action-btn flex-auto">
 				<i class="fas fa-external-link-alt mr-2" /> SVG
 			</button>
 		</a>
-		<a target="_blank" class="flex-grow" href={krokiUrl}>
-			<button class="action-btn w-full">
+
+		<a target="_blank" href={krokiUrl}>
+			<button class="action-btn flex-auto">
 				<i class="fas fa-external-link-alt mr-2" /> Kroki
 			</button>
 		</a>

src/lib/components/editor.svelte

@@ -7,6 +7,7 @@
 	import { onMount } from 'svelte';
 	import initEditor from 'monaco-mermaid';
 	import { logEvent } from '$lib/util/stats';
+	import { debounceEnabled } from '$lib/util/env';
 
 	let divEl: HTMLDivElement = null;
 	let editor: monaco.editor.IStandaloneCodeEditor;
@@ -36,8 +37,10 @@
 			Monaco?.editor.setModelLanguage(editor.getModel(), language);
 		}
 
-		// Display/clear errors
-		Monaco?.editor.setModelMarkers(editor.getModel(), 'mermaid', errorMarkers);
+		// Display errors if present
+		if (errorMarkers.length > 0) {
+			Monaco?.editor.setModelMarkers(editor.getModel(), 'test', errorMarkers);
+		}
 	});
 
 	themeStore.subscribe(({ isDark }) => {
@@ -52,16 +55,31 @@
 		}
 	};
 
+	// Debounce state updates to avoid performance issues
+	let debounce: { [key: string]: number } = {};
+	const updateHandler = (newText: string) => {
+		text = newText;
+		const mode = $stateStore.editorMode;
+		if (debounceEnabled) {
+			clearTimeout(debounce[mode]);
+			debounce[mode] = window.setTimeout(() => {
+				handleUpdate(text, mode);
+			}, 300);
+		} else {
+			handleUpdate(text, mode);
+		}
+	};
+
 	const loadMonaco = async () => {
-		console.log('Loading Monaco...');
 		let i = 0;
 		while (i++ < 500) {
-			// @ts-ignore : This is a hack to handle a svelte-kit error when importing monaco.
-			Monaco = window.monaco;
-			if (Monaco !== undefined) {
+			try {
+				// @ts-ignore : This is a hack to handle a svelte-kit error when importing monaco.
+				Monaco = window.monaco;
 				return;
+			} catch {
+				await new Promise((r) => setTimeout(r, 100));
 			}
-			await new Promise((r) => setTimeout(r, 100));
 		}
 		alert('Loading Monaco Editor failed. Please try refreshing the page.');
 	};
@@ -71,8 +89,7 @@
 		initEditor(Monaco);
 		editor = Monaco.editor.create(divEl, editorOptions);
 		editor.onDidChangeModelContent(() => {
-			text = editor.getValue();
-			handleUpdate(text, $stateStore.editorMode);
+			updateHandler(editor.getValue());
 		});
 		editor.addAction({
 			id: 'mermaid-render-diagram',
@@ -80,7 +97,7 @@
 			keybindings: [Monaco.KeyMod.CtrlCmd | Monaco.KeyCode.Enter],
 			run: function () {
 				syncDiagram();
-				logEvent('renderDiagram', {
+				void logEvent('renderDiagram', {
 					method: 'keyboadShortcut'
 				});
 			}

src/lib/components/navbar.svelte

@@ -39,7 +39,7 @@
 	];
 </script>
 
-<div class="navbar shadow-lg bg-primary p-0">
+<div class="navbar mb-2 shadow-lg bg-primary">
 	<div class="flex-1 px-2 mx-2">
 		<span class="text-lg font-bold">
 			<a href="/">Mermaid<span class="text-xs font-thin">v{version}</span> Live Editor</a>

src/lib/components/preset.svelte

@@ -4,19 +4,18 @@
 	import { logEvent } from '$lib/util/stats';
 
 	const samples = {
-		'Flow Chart': `graph TD
+		Flow: `graph TD
     A[Christmas] -->|Get money| B(Go shopping)
     B --> C{Let me think}
     C -->|One| D[Laptop]
     C -->|Two| E[iPhone]
     C -->|Three| F[fa:fa-car Car]`,
-		'Sequence Diagram': `sequenceDiagram
+		Sequence: `sequenceDiagram
     Alice->>+John: Hello John, how are you?
     Alice->>+John: John, can you hear me?
     John-->>-Alice: Hi Alice, I can hear you!
-    John-->>-Alice: I feel great!
-            `,
-		'Class Diagram': `classDiagram
+    John-->>-Alice: I feel great!`,
+		Class: `classDiagram
     Animal <|-- Duck
     Animal <|-- Fish
     Animal <|-- Zebra
@@ -36,17 +35,15 @@
     class Zebra{
       +bool is_wild
       +run()
-    }
-            `,
-		'State Diagram': `stateDiagram-v2
+    }`,
+		State: `stateDiagram-v2
     [*] --> Still
     Still --> [*]
     Still --> Moving
     Moving --> Still
     Moving --> Crash
-    Crash --> [*]
-            `,
-		'Gantt Chart': `gantt
+    Crash --> [*]`,
+		Gantt: `gantt
     title A Gantt Diagram
     dateFormat  YYYY-MM-DD
     section Section
@@ -54,24 +51,21 @@
     Another task     :after a1  , 20d
     section Another
     Task in sec      :2014-01-12  , 12d
-    another task      : 24d
-            `,
-		'Pie Chart': `pie title Pets adopted by volunteers
+    another task      : 24d`,
+		Pie: `pie title Pets adopted by volunteers
     "Dogs" : 386
     "Cats" : 85
-    "Rats" : 15
-            `,
-		'ER Diagram': `erDiagram
-          CUSTOMER }|..|{ DELIVERY-ADDRESS : has
-          CUSTOMER ||--o{ ORDER : places
-          CUSTOMER ||--o{ INVOICE : "liable for"
-          DELIVERY-ADDRESS ||--o{ ORDER : receives
-          INVOICE ||--|{ ORDER : covers
-          ORDER ||--|{ ORDER-ITEM : includes
-          PRODUCT-CATEGORY ||--|{ PRODUCT : contains
-          PRODUCT ||--o{ ORDER-ITEM : "ordered in"
-            `,
-		'User Journey': `  journey
+    "Rats" : 15`,
+		ER: `erDiagram
+    CUSTOMER }|..|{ DELIVERY-ADDRESS : has
+    CUSTOMER ||--o{ ORDER : places
+    CUSTOMER ||--o{ INVOICE : "liable for"
+    DELIVERY-ADDRESS ||--o{ ORDER : receives
+    INVOICE ||--|{ ORDER : covers
+    ORDER ||--|{ ORDER-ITEM : includes
+    PRODUCT-CATEGORY ||--|{ PRODUCT : contains
+    PRODUCT ||--o{ ORDER-ITEM : "ordered in"`,
+		'User Journey': `journey
     title My working day
     section Go to work
       Make tea: 5: Me
@@ -79,20 +73,35 @@
       Do work: 1: Me, Cat
     section Go home
       Go downstairs: 5: Me
-      Sit down: 3: Me
-      `,
-		'Git Graph': `    gitGraph
-      commit
-      commit
-      branch develop
-      checkout develop
-      commit
-      commit
-      checkout main
-      merge develop
-      commit
-      commit
-`
+      Sit down: 3: Me`,
+		Git: `gitGraph
+    commit
+    commit
+    branch develop
+    checkout develop
+    commit
+    commit
+    checkout main
+    merge develop
+    commit
+    commit`,
+		Mindmap: `mindmap
+  root((mindmap))
+    Origins
+      Long history
+      ::icon(fa fa-book)
+      Popularisation
+        British popular psychology author Tony Buzan
+    Research
+      On effectivness<br/>and eatures
+      On Automatic creation
+        Uses
+            Creative techniques
+            Strategic planning
+            Argument mapping
+    Tools
+      Pen and paper
+      Mermaid`
 	};
 
 	const loadSampleDiagram = (diagramType: string): void => {
@@ -100,15 +109,36 @@
 			updateDiagram: true,
 			resetPanZoom: true
 		});
-		logEvent('loadSampleDiagram', { diagramType });
+		void logEvent('loadSampleDiagram', { diagramType });
 	};
+
+	// Adding in this array will add an icon to the preset menu
+	const newDiagrams: Array<keyof typeof samples> = ['Mindmap'];
+	const diagramOrder: Array<keyof typeof samples> = [
+		'Sequence',
+		'Flow',
+		'Class',
+		'State',
+		'ER',
+		'Gantt',
+		'User Journey',
+		'Git',
+		'Pie',
+		'Mindmap'
+	];
 </script>
 
 <Card title="Sample Diagrams" isOpen={false}>
-	<div class="flex gap-2 flex-wrap p-2">
-		{#each Object.keys(samples) as sample}
-			<button class="btn btn-primary normal-case btn-sm" on:click={() => loadSampleDiagram(sample)}
-				>{sample}</button>
+	<div class="flex flex-wrap p-2 gap-2">
+		{#each diagramOrder as sample}
+			<button
+				class="btn btn-sm btn-primary w-28 normal-case flex-grow"
+				on:click={() => loadSampleDiagram(sample)}>
+				{sample}
+				{#if newDiagrams.includes(sample)}
+					<span class="ml-2 fa fa-heart" />
+				{/if}
+			</button>
 		{/each}
 	</div>
 </Card>

src/lib/components/view.svelte

@@ -1,11 +1,10 @@
 <script lang="ts">
 	import { inputStateStore, stateStore, updateCodeStore } from '$lib/util/state';
 	import { onMount } from 'svelte';
+	import mermaid from 'mermaid';
 	import panzoom from 'svg-pan-zoom';
-	import type { State, ValidatedState } from '$lib/types';
+	import type { State } from '$lib/types';
 	import { logEvent } from '$lib/util/stats';
-	import { cmdKey } from '$lib/util/util';
-	import { render as renderDiagram } from '$lib/util/mermaid';
 
 	let code = '';
 	let config = '';
@@ -17,12 +16,16 @@
 	let manualUpdate = true;
 	let panZoomEnabled = $stateStore.panZoom;
 	let pzoom: SvgPanZoom.Instance;
+	let debounce: number;
 
 	const handlePanZoomChange = () => {
 		const pan = pzoom.getPan();
 		const zoom = pzoom.getZoom();
-		updateCodeStore({ pan, zoom });
-		logEvent('panZoom');
+		clearTimeout(debounce);
+		debounce = window.setTimeout(() => {
+			updateCodeStore({ pan, zoom });
+			void logEvent('panZoom');
+		}, 200);
 	};
 
 	const handlePanZoom = (state: State) => {
@@ -50,61 +53,50 @@
 		});
 	};
 
-	const handleStateChange = async (state: ValidatedState) => {
-		if (state.error !== undefined) {
-			error = true;
-			return;
-		}
-		error = false;
-		try {
-			if (container && state && (state.updateDiagram || state.autoSync)) {
-				if (!state.autoSync) {
-					$inputStateStore.updateDiagram = false;
-				}
-				outOfSync = false;
-				manualUpdate = true;
-				if (code === state.code && config === state.mermaid && panZoomEnabled === state.panZoom) {
-					// Do not render if there is no change in Code/Config/PanZoom
-					return;
-				}
-				code = state.code;
-				config = state.mermaid;
-				panZoomEnabled = state.panZoom;
-				const scroll = view.parentElement.scrollTop;
-				delete container.dataset.processed;
-				await renderDiagram(
-					Object.assign({}, JSON.parse(state.mermaid)),
-					code,
-					'graph-div',
-					(svgCode, bindFunctions) => {
+	onMount(() => {
+		stateStore.subscribe((state) => {
+			if (state.error !== undefined) {
+				error = true;
+				return;
+			}
+			error = false;
+			try {
+				if (container && state && (state.updateDiagram || state.autoSync)) {
+					if (!state.autoSync) {
+						$inputStateStore.updateDiagram = false;
+					}
+					outOfSync = false;
+					manualUpdate = true;
+					if (code === state.code && config === state.mermaid && panZoomEnabled === state.panZoom) {
+						// Do not render if there is no change in Code/Config/PanZoom
+						return;
+					}
+					code = state.code;
+					config = state.mermaid;
+					panZoomEnabled = state.panZoom;
+					const scroll = view.parentElement.scrollTop;
+					delete container.dataset.processed;
+					mermaid.initialize(Object.assign({}, JSON.parse(state.mermaid)));
+					mermaid.render('graph-div', code, (svgCode) => {
 						if (svgCode.length > 0) {
 							handlePanZoom(state);
 							container.innerHTML = svgCode;
 							const graphDiv = document.getElementById('graph-div');
 							graphDiv.setAttribute('height', '100%');
 							graphDiv.style.maxWidth = '100%';
-							if (bindFunctions) {
-								bindFunctions(graphDiv);
-							}
 						}
-					}
-				);
-				view.parentElement.scrollTop = scroll;
-				error = false;
-			} else if (manualUpdate) {
-				manualUpdate = false;
-			} else if (code !== state.code || config !== state.mermaid) {
-				outOfSync = true;
+					});
+					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);
+				error = true;
 			}
-		} catch (e) {
-			console.error('view fail', e);
-			error = true;
-		}
-	};
-
-	onMount(() => {
-		stateStore.subscribe(async (state) => {
-			await handleStateChange(state);
 		});
 		window.addEventListener('resize', () => {
 			if ($stateStore.panZoom && pzoom) {
@@ -118,12 +110,6 @@
 	<div class="p-2 text-red-600" id="errorContainer">{$stateStore.error}</div>
 {/if}
 
-{#if outOfSync}
-	<div class="absolute w-full p-2 z-10 text-yellow-600 bg-base-100 bg-opacity-80 text-center">
-		Diagram out of sync. <br />
-		Press <i class="fas fa-sync" /> (Sync button) or <kbd>{cmdKey} + Enter</kbd> to sync.
-	</div>
-{/if}
 <div id="view" bind:this={view} class="p-2 h-full" class:error class:outOfSync>
 	<div id="container" bind:this={container} class="h-full overflow-auto" class:hide />
 </div>

src/lib/util/env.ts

@@ -1,9 +1,5 @@
-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
-};
+export const rendererUrl: string =
+	(import.meta.env.MERMAID_RENDERER_URL as string) ?? 'https://mermaid.ink';
+export const krokiRendererUrl: string =
+	(import.meta.env.MERMAID_KROKI_RENDERER_URL as string) ?? 'https://kroki.io';
+export const debounceEnabled: boolean = import.meta.env.MERMAID_DISABLE_DEBOUNCE !== 'true';

src/lib/util/mermaid.ts

@@ -1,47 +0,0 @@
-import mermaid from 'mermaid';
-// We need to export MermaidConfig and all related types from mermaid.
-import type { MermaidConfig } from 'mermaid/dist/config.type';
-import { env } from './env';
-const { mermaidBaseURL, mermaidCDNUrl, useLocalMermaid } = env;
-
-const getDiagramURL = (name: string, version: string): string => {
-	if (useLocalMermaid) {
-		return `${mermaidBaseURL}/${name}-detector.esm.mjs`;
-	}
-	return `${mermaidCDNUrl}/${name}@${version}/dist/${name}-detector.esm.mjs`;
-};
-
-console.log(mermaid);
-const initialize = mermaid.initializeAsync({
-	logLevel: 0,
-	lazyLoadedDiagrams: [getDiagramURL('mermaid-mindmap', '9.2.0-rc4')],
-	loadExternalDiagramsAtStartup: true
-});
-
-export const init = async () => {
-	await initialize;
-};
-
-export const render = async (
-	config: MermaidConfig,
-	code: string,
-	id: string,
-	callback: Parameters<typeof mermaid.render>[2]
-): Promise<void> => {
-	await init();
-	// Should be able to call this multiple times without any issues.
-	// await mermaid.initialize({
-	// 	...config,
-	// 	lazyLoadedDiagrams: [
-	// 		// We should make SRI mandatory for all lazy-loaded diagrams.
-	// 		'https://unpkg.com/@mermaid-js/mermaid-mindmap@9.2.0-rc2/dist/mermaid-mindmap-detector.esm.mjs'
-	// 	]
-	// });
-	console.log('Rendering', code);
-	await mermaid.mermaidAPI.renderAsync(id, code, callback);
-};
-
-export const parse = async (code: string): Promise<boolean> => {
-	await init();
-	return mermaid.parseAsync(code);
-};

src/lib/util/state.ts

@@ -1,15 +1,13 @@
 import { writable, get, derived } from 'svelte/store';
 import { persist, localStorage } from './persist';
-import { saveStatistics, countLines } from './stats';
+import { saveStatistics } from './stats';
 import { serializeState, deserializeState } from './serde';
 import { cmdKey } from './util';
-import { parse, init } from './mermaid';
+import mermaid from 'mermaid';
 
 import type { Readable } from 'svelte/store';
 import type { MarkerData, State, ValidatedState } from '$lib/types';
 
-void init();
-
 export const defaultState: State = {
 	code: `graph TD
     A[Christmas] -->|Get money| B(Go shopping)
@@ -44,53 +42,41 @@ const urlParseFailedState = `graph TD
 export const inputStateStore = persist(writable(defaultState), localStorage(), 'codeStore');
 
 // All internal reads should be done via stateStore, but it should not be persisted/shared externally.
-export const stateStore: Readable<ValidatedState> = derived(
-	[inputStateStore],
-	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-	// @ts-ignore
-	async ([state], set) => {
-		const processed: ValidatedState = {
-			...state,
-			serialized: '',
-			errorMarkers: [],
-			error: undefined,
-			editorMode: state.editorMode ?? 'code'
-		};
-
-		// No changes should be done to fields part of `state`.
-		try {
-			processed.serialized = serializeState(state);
-			await parse(state.code);
-			JSON.parse(state.mermaid);
-		} catch (e) {
-			processed.error = e;
-			console.error(e);
-			if (e.hash) {
-				try {
-					const marker: MarkerData = {
-						severity: 8, // Error
-						startLineNumber: e.hash.loc.first_line,
-						startColumn: e.hash.loc.first_column,
-						endLineNumber: e.hash.loc.last_line,
-						endColumn: (e.hash.loc.last_column as number) + 1,
-						message: e.str
-					};
-					processed.errorMarkers = [marker];
-				} catch (err) {
-					console.error('Error without line helper', err);
-				}
-			}
-		}
-		set(processed);
-	},
-	{
-		...get(inputStateStore),
+export const stateStore: Readable<ValidatedState> = derived([inputStateStore], ([state]) => {
+	const processed: ValidatedState = {
+		...state,
 		serialized: '',
 		errorMarkers: [],
 		error: undefined,
-		editorMode: get(inputStateStore).editorMode ?? 'code'
+		editorMode: state.editorMode ?? 'code'
+	};
+
+	// No changes should be done to fields part of `state`.
+	try {
+		processed.serialized = serializeState(state);
+		mermaid.parse(state.code);
+		JSON.parse(state.mermaid);
+	} catch (e) {
+		processed.error = e;
+		console.error(e);
+		if (e.hash) {
+			try {
+				const marker: MarkerData = {
+					severity: 8, // Error
+					startLineNumber: e.hash.loc.first_line,
+					startColumn: e.hash.loc.first_column,
+					endLineNumber: e.hash.loc.last_line,
+					endColumn: (e.hash.loc.last_column as number) + 1,
+					message: e.str
+				};
+				processed.errorMarkers = [marker];
+			} catch (err) {
+				console.error('Error without line helper', err);
+			}
+		}
 	}
-);
+	return processed;
+});
 
 export const loadState = (data: string): void => {
 	let state: State;
@@ -135,8 +121,8 @@ export const updateCode = (
 		resetPanZoom = false
 	}: { updateDiagram?: boolean; resetPanZoom?: boolean } = {}
 ): void => {
-	const lines = countLines(code);
 	saveStatistics(code);
+	const lines = (code.match(/\n/g) || '').length + 1;
 
 	if (lines > 50 && !prompted && get(stateStore).autoSync) {
 		const turnOff = confirm(
@@ -176,13 +162,9 @@ export const toggleDarkTheme = (dark: boolean): void => {
 	});
 };
 
-let urlDebounce: number;
 export const initURLSubscription = (): void => {
 	stateStore.subscribe(({ serialized }) => {
-		clearTimeout(urlDebounce);
-		urlDebounce = window.setTimeout(() => {
-			history.replaceState(undefined, undefined, `#${serialized}`);
-		}, 250);
+		history.replaceState(undefined, undefined, `#${serialized}`);
 	});
 };
 

src/lib/util/stats.test.ts

@@ -1,19 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { detectType } from './stats';
-describe('diagram detection', () => {
-	it('should detect diagrams correctly', () => {
-		expect(
-			detectType(`%%{{
-			graph`)
-		).toBe('graph');
-		expect(detectType(`gitGraph`)).toBe('gitGraph');
-		expect(
-			detectType(`%%{{
-
-
-			flowChart
-			graph`)
-		).toBe('flowChart');
-		expect(detectType(`loki -> thor`)).toBe(undefined);
-	});
-});

src/lib/util/stats.ts

@@ -1,17 +1,25 @@
 import { browser } from '$app/environment';
 import type { AnalyticsInstance } from 'analytics';
+
 export let analytics: AnalyticsInstance;
 
 export const initAnalytics = async (): Promise<void> => {
 	if (browser && !analytics) {
 		try {
-			const [{ Analytics }, { default: plausible }] = await Promise.all([
-				import('analytics'),
-				import('analytics-plugin-plausible')
-			]);
+			const { Analytics } = await import('analytics');
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+			const googleAnalytics = (await import('@analytics/google-analytics')).default;
+			const plausible = (await import('analytics-plugin-plausible')).default;
 			analytics = Analytics({
 				app: 'mermaid-live-editor',
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 				plugins: [
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+					googleAnalytics({
+						measurementIds: ['UA-153180559-1']
+					}),
+					// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+					// @ts-ignore
 					plausible({
 						domain: 'mermaid.live',
 						hashMode: false,
@@ -27,72 +35,28 @@ export const initAnalytics = async (): Promise<void> => {
 	}
 };
 
-export const detectType = (text: string): string => {
-	const possibleDiagramTypes = [
-		'classDiagram',
-		'erDiagram',
-		'flowChart',
-		'gantt',
-		'gitGraph',
-		'graph',
-		'journey',
-		'pie',
-		'stateDiagram'
-	];
-	const firstLine = text
+const detectType = (text: string): string => {
+	return text
 		.replace(/^\s*%%.*\n/g, '\n')
 		.trimStart()
-		.split(' ')[0]
-		.toLowerCase();
-	const detectedDiagram = possibleDiagramTypes.find((d) => firstLine.includes(d.toLowerCase()));
-	return detectedDiagram;
-};
-
-export const countLines = (code: string): number => {
-	return (code.match(/\n/g) || '').length + 1;
+		.split(' ')[0];
 };
 
+// manual debounce
+let timeout: number;
 export const saveStatistics = (graph: string): void => {
-	const graphType = detectType(graph);
-	if (!graphType) {
-		return;
+	if (analytics) {
+		clearTimeout(timeout);
+		// Only save statistics after a 5 sec delay
+		timeout = window.setTimeout(() => {
+			const graphType = detectType(graph);
+			console.debug(`ga: send event: render ${graphType}`);
+			void logEvent('render', { graphType });
+		}, 5000);
 	}
-	const length = countLines(graph);
-	logEvent('render', { graphType, length });
 };
 
-const minutesToMilliSeconds = (minutes: number): number => {
-	return minutes * 60_000;
-};
-
-const defaultDelay = minutesToMilliSeconds(1);
-const delaysPerEvent = {
-	render: minutesToMilliSeconds(5),
-	panZoom: minutesToMilliSeconds(10),
-	copyClipboard: defaultDelay,
-	download: defaultDelay,
-	copyMarkdown: defaultDelay,
-	loadGist: defaultDelay,
-	loadSampleDiagram: defaultDelay,
-	renderDiagram: defaultDelay,
-	history: defaultDelay,
-	migration: defaultDelay,
-	themeChange: defaultDelay
-};
-export type AnalyticsEvent = keyof typeof delaysPerEvent;
-const timeouts: Record<string, number> = {};
-// manual debounce to reduce the number of events sent to analytics
-export const logEvent = (name: AnalyticsEvent, data?: unknown): void => {
-	if (!analytics) {
-		return;
-	}
-	const key = data ? JSON.stringify({ name, data }) : name;
-	if (timeouts[key] === undefined) {
-		void analytics.track(name, data);
-	} else {
-		clearTimeout(timeouts[key]);
-	}
-	timeouts[key] = window.setTimeout(() => {
-		delete timeouts[key];
-	}, delaysPerEvent[name]);
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const logEvent = async (name: string, data?: any): Promise<void> => {
+	await analytics?.track(name, data);
 };

src/lib/util/theme.ts

@@ -34,5 +34,5 @@ export const setTheme = (theme: string): void => {
 	const isDark = darkThemes.includes(theme);
 	console.log('Setting theme', theme);
 	themeStore.set({ theme, isDark });
-	logEvent('themeChange', { theme, isDark });
+	void logEvent('themeChange', { theme, isDark });
 };

static/favicon.svg

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 491 491" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <path d="M490.16,84.61C490.16,37.912 452.248,0 405.55,0L84.61,0C37.912,0 0,37.912 0,84.61L0,405.55C0,452.248 37.912,490.16 84.61,490.16L405.55,490.16C452.248,490.16 490.16,452.248 490.16,405.55L490.16,84.61Z" style="fill:rgb(255,54,112);"/>
-    <path d="M407.48,111.18C335.587,108.103 269.573,152.338 245.08,220C220.587,152.338 154.573,108.103 82.68,111.18C80.285,168.229 107.577,222.632 154.74,254.82C178.908,271.419 193.35,298.951 193.27,328.27L193.27,379.13L296.9,379.13L296.9,328.27C296.816,298.953 311.255,271.42 335.42,254.82C382.596,222.644 409.892,168.233 407.48,111.18Z" style="fill:white;fill-rule:nonzero;"/>
-</svg>

static/manifest.json

@@ -3,7 +3,12 @@
 	"name": "Mermaid Live Editor",
 	"icons": [
 		{
-			"src": "/favicon.png",
+			"src": "/icon-192.png",
+			"type": "image/png",
+			"sizes": "192x192"
+		},
+		{
+			"src": "/icon-512.png",
 			"type": "image/png",
 			"sizes": "512x512"
 		}