Add precompress option

.eslintignore

@@ -1,8 +0,0 @@
-docs/**
-.svelte-kit/**
-static/**
-build/**
-node_modules/**
-coverage/**
-__snapshots__/**
-snapshots.js

.eslintrc.cjs

@@ -7,7 +7,7 @@ module.exports = {
 		// 'plugin:@typescript-eslint/recommended-requiring-type-checking',
 		'prettier'
 	],
-	plugins: ['svelte3', 'tailwindcss', '@typescript-eslint', 'es', 'vitest'],
+	plugins: ['svelte3', 'tailwindcss', '@typescript-eslint', 'es'],
 	ignorePatterns: [
 		'docs/*',
 		'*.cjs',

.github/workflows/cypress.yml

@@ -1,4 +1,4 @@
-name: Tests
+name: Cypress Tests
 
 on:
   pull_request:
@@ -9,11 +9,6 @@ on:
 jobs:
   cypress-run:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        # run 3 copies of the current job in parallel
-        containers: [1, 2, 3]
 
     steps:
       - name: Checkout
@@ -35,16 +30,20 @@ jobs:
           node-version: 16
           cache: 'yarn'
 
+      - name: Build & Lint
+        run: |
+          yarn install
+          yarn build
+          yarn lint
+
       # Install NPM dependencies, cache them correctly
       # and run all Cypress tests
       - name: Cypress run
         uses: cypress-io/github-action@v3
         with:
-          build: yarn build
           start: yarn preview
           wait-on: 'http://localhost:3000'
           record: true
           headless: true
-          parallel: true
         env:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}

.github/workflows/unit-tests.yml

@@ -1,36 +0,0 @@
-name: Unit Tests
-
-on:
-  pull_request:
-    branches:
-      - master
-      - develop
-
-jobs:
-  unit-tests:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - uses: actions/cache@v3
-        id: yarn-and-build-cache
-        with:
-          path: |
-            build
-            node_modules
-          key: ${{ runner.os }}-node_modules-build-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node_modules-build-
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          cache: 'yarn'
-
-      - name: Lint & Test
-        run: |
-          yarn install
-          yarn lint
-          yarn test:unit

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

@@ -10,13 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18
-      - name: Update monaco version
-        run: |
-          yarn install
-          node ./bin/update-monaco.js
+      - run: ./bin/update-monaco
       - name: Commit changes
         uses: EndBug/add-and-commit@v9
         with:

.prettierignore

@@ -3,6 +3,4 @@ docs/**
 static/**
 build/**
 node_modules/**
-coverage/**
-__snapshots__/**
 snapshots.js

.vscode/launch.json

@@ -1,15 +0,0 @@
-{
-	// Use IntelliSense to learn about possible attributes.
-	// Hover to view descriptions of existing attributes.
-	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"type": "pwa-chrome",
-			"request": "launch",
-			"name": "Launch Chrome against localhost",
-			"url": "http://localhost:3000",
-			"webRoot": "${workspaceFolder}"
-		}
-	]
-}

Dockerfile

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

SECURITY.md

@@ -6,7 +6,7 @@ Live editor only has a single version, which will be maintained.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| latest  | :white_check_mark: |
+| latest   | :white_check_mark: |
 
 ## Reporting a Vulnerability
 

bin/update-monaco

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+monacoVersion="$(jq -r '.dependencies."monaco-editor"' package.json)"
+monacoVersion="${monacoVersion:1}"
+
+if [[ $(uname) == "Darwin" ]]; 
+then
+    sed -i '' -E "s/monaco-editor\/[^/]*/monaco-editor\/$monacoVersion/g" ./src/app.html
+else
+    sed -i'' -E "s/monaco-editor\/[^/]*/monaco-editor\/$monacoVersion/g" ./src/app.html
+fi
+

bin/update-monaco.js

@@ -1,45 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { parse } from 'node-html-parser';
-import prettier from 'prettier';
-
-// parse monaco version out of package.json
-const packageJson = JSON.parse(fs.readFileSync('package.json'));
-const monacoVersion = packageJson.dependencies['monaco-editor'].replace('^', '');
-
-// fetch monaco sri info from cdnjs api
-const cdnjsAPIResp = await fetch(
-	`https://api.cdnjs.com/libraries/monaco-editor/${monacoVersion}?fields=sri`
-);
-if (cdnjsAPIResp.ok) {
-	const respJson = await cdnjsAPIResp.json();
-	const htmlPath = path.join('src', 'app.html');
-	const appHtml = fs
-		.readFileSync(htmlPath, 'utf8')
-		// update monaco version of every asset in app.html
-		.replaceAll(/[0-9.]+\/min\/vs/g, `${monacoVersion}/min/vs`);
-	const root = parse(appHtml);
-	const updateIntegrity = (tag, attr) => {
-		for (const node of root
-			.getElementsByTagName(tag)
-			.filter((node) => node.getAttribute(attr)?.includes('monaco-editor'))) {
-			const file = node.getAttribute(attr).split(`${monacoVersion}/`)[1];
-			node.setAttribute('integrity', respJson.sri[file]);
-		}
-	};
-
-	updateIntegrity('script', 'src');
-	updateIntegrity('link', 'href');
-
-	fs.writeFileSync(
-		htmlPath,
-		prettier.format(root.toString(), {
-			singleQuote: false,
-			parser: 'html',
-			bracketSameLine: true,
-			useTabs: true
-		})
-	);
-} else {
-	throw Error('Unable to fetch monaco sri data from cdnjs api.');
-}

cypress.config.js

@@ -8,10 +8,6 @@ export default defineConfig({
 	snapshotFileName: './cypress/snapshots.js',
 	defaultCommandTimeout: 16000,
 	requestTimeout: 16000,
-	retries: {
-		runMode: 2,
-		openMode: 0
-	},
 	e2e: {
 		setupNodeEvents(on, config) {
 			on('task', {
@@ -30,6 +26,6 @@ export default defineConfig({
 			});
 		},
 		baseUrl: 'http://localhost:3000',
-		specPattern: 'cypress/e2e/**/*.spec.ts'
+		specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}'
 	}
 });

cypress/.eslintrc

@@ -1,10 +1,12 @@
 {
-	"plugins": ["cypress"],
-	"extends": ["plugin:cypress/recommended"],
+	"plugins": ["cypress", "mocha"],
+	"extends": ["plugin:cypress/recommended", "plugin:mocha/recommended"],
 	"rules": {
-		"jest/expect-expect": "off"
+		"jest/expect-expect": "off",
+		"mocha/no-mocha-arrows": "off"
 	},
 	"env": {
-		"cypress/globals": true
+		"cypress/globals": true,
+		"mocha": true
 	}
 }

cypress/e2e/actions.spec.ts

@@ -1,9 +1,7 @@
-import { disableDebounce } from './util';
 describe('Check actions', () => {
 	beforeEach(() => {
 		cy.clearLocalStorage();
 		cy.visit('/edit');
-		disableDebounce();
 	});
 
 	it('should update markdown code', () => {
@@ -26,7 +24,8 @@ describe('Check actions', () => {
 	});
 
 	it('should download png and svg', () => {
-		cy.clock(new Date(2022, 0, 1).getTime());
+		const now = new Date(2022, 0, 1).getTime();
+		cy.clock(now);
 		const downloadsFolder = Cypress.config('downloadsFolder');
 
 		const verifyFileSize = (fileType: string, size: number) => {

cypress/e2e/diagramUpdate.spec.ts

@@ -1,29 +1,17 @@
-import { getEditor, cmd, disableDebounce } from './util';
-
 describe('Auto sync tests', () => {
 	beforeEach(() => {
 		cy.clearLocalStorage();
 		cy.visit('/');
-		disableDebounce();
 	});
 
 	it('should dim diagram when code is edited', () => {
 		cy.contains('Auto sync').click();
 		cy.get('#view').should('not.have.class', 'outOfSync');
-		getEditor().type('  C --> Test');
+		cy.get('#editor').type('  C --> Test');
 		cy.get('#view').should('have.class', 'outOfSync');
 		cy.getLocalStorage('codeStore').snapshot();
 	});
 
-	it('should update diagram when shortcut is used', () => {
-		cy.contains('Auto sync').click();
-		cy.get('#view').should('not.have.class', 'outOfSync');
-		getEditor().type('  C --> Test');
-		cy.get('#view').should('have.class', 'outOfSync');
-		getEditor().type(`${cmd}{enter}`);
-		cy.get('#view').should('not.have.class', 'outOfSync');
-	});
-
 	it('should show/hide sync button with auto sync', () => {
 		cy.get('[data-cy=sync]').should('not.exist');
 		cy.contains('Auto sync').click();
@@ -31,25 +19,26 @@ describe('Auto sync tests', () => {
 		cy.get('#autoSync').check();
 		cy.get('[data-cy=sync]').should('not.exist');
 	});
-
 	it('should not dim diagram when code is in sync', () => {
 		cy.contains('Auto sync').click();
 		cy.get('#view').should('not.have.class', 'outOfSync');
-		getEditor().type('  C --> Test');
+		cy.get('#editor').type('  C --> Test');
 		cy.get('#view').should('have.class', 'outOfSync');
 		cy.get('[data-cy=sync]').click();
 		cy.get('#view').should('not.have.class', 'outOfSync');
 		cy.get('#autoSync').check();
-		getEditor().type('ing');
+		cy.get('#editor').type('ing');
 		cy.get('#view').should('not.have.class', 'outOfSync');
 		cy.getLocalStorage('codeStore').snapshot();
 	});
 
 	it('supports commenting code out/in', () => {
-		getEditor().type(`{uparrow}${cmd}/`);
+		const cmd = Cypress.platform === 'darwin' ? 'meta' : 'ctrl';
+
+		cy.get('#editor').type(`{uparrow}{${cmd}}/`);
 		cy.get('#view').contains('Car').should('not.exist');
 
-		getEditor().type(`{uparrow}${cmd}/`);
+		cy.get('#editor').type(`{uparrow}{${cmd}}/`);
 		cy.get('#view').contains('Car').should('exist');
 	});
 
@@ -57,8 +46,7 @@ describe('Auto sync tests', () => {
 		cy.visit(
 			'/edit#pako:eNpljjEKwzAMRa8SNOcEnlt6gK5eVFvYJsgOqkwpIXevg9smEE1PnyfxF3DFExgISW-CczQ2D21cYU7a-SGYXRwyvTp9jUhuKlVP-eHy7zA-leQsMEmg_QOM0BLG5FujZVMsaCQmC6ahR5ks2Lw2r84ela4-aREwKpVGwKrl_s7ut3fnkjAIcg_XDzuaUhs'
 		);
-		cy.get('#errorContainer').should('not.exist');
-		getEditor({ newline: true }).type(`branch test`);
+		cy.get('#editor').type(`{enter}branch test`);
 		cy.get('#editor').contains('branch test').should('exist');
 		cy.get('#errorContainer')
 			.contains(
@@ -67,18 +55,3 @@ describe('Auto sync tests', () => {
 			.should('exist');
 	});
 });
-
-describe.only('Pan and Zoom', () => {
-	beforeEach(() => {
-		cy.clearLocalStorage();
-		cy.visit('/');
-		disableDebounce();
-	});
-	it('should toggle pan and zoom', () => {
-		cy.get('#svg-pan-zoom-reset-pan-zoom').should('not.exist');
-		cy.contains('Pan & Zoom').click();
-		cy.get('#svg-pan-zoom-reset-pan-zoom').should('exist');
-		cy.contains('Pan & Zoom').click();
-		cy.get('#svg-pan-zoom-reset-pan-zoom').should('not.exist');
-	});
-});

cypress/e2e/history.spec.ts

@@ -1,11 +1,8 @@
-import { getEditor, disableDebounce } from './util';
-
 describe('Save History', () => {
 	beforeEach(() => {
 		cy.clock();
 		cy.clearLocalStorage();
 		cy.visit('/edit');
-		disableDebounce();
 		cy.contains('Actions').click();
 		cy.contains('History').click();
 	});
@@ -21,14 +18,14 @@ describe('Save History', () => {
 			expect(str).to.equal('State already saved.');
 		});
 		cy.on('window:confirm', () => true);
-		getEditor().type('  C --> HistoryTest');
+		cy.get('#editor').type('  C --> HistoryTest');
 		cy.get('#saveHistory').click();
 		cy.get('#historyList').find('li').should('have.length', 2);
 	});
 
 	it('should be able to restore and delete', () => {
 		cy.get('#saveHistory').click();
-		getEditor().type('  C --> HistoryTest');
+		cy.get('#editor').type('  C --> HistoryTest');
 		cy.get('#historyList').find('No items in History').should('not.exist');
 		cy.get('#historyList').find('li').should('have.length', 1);
 		cy.contains('HistoryTest');
@@ -38,7 +35,7 @@ describe('Save History', () => {
 		cy.get('#historyList').find('li').should('have.length', 0);
 		cy.get('#historyList').contains('No items in History');
 		cy.get('#saveHistory').click();
-		getEditor().type('  C --> HistoryTest');
+		cy.get('#editor').type('  C --> HistoryTest');
 		cy.get('#saveHistory').click();
 		cy.get('#editor').type('ing');
 		cy.get('#clearHistory').click();
@@ -50,8 +47,9 @@ describe('Save History', () => {
 	});
 
 	// TODO: Fix #639
+	// eslint-disable-next-line mocha/no-skipped-tests
 	xit('should auto save history', () => {
-		getEditor().type('  C --> HistoryTest');
+		cy.get('#editor').type('  C --> HistoryTest');
 		cy.tick(70000);
 		cy.contains('Timeline').click();
 		cy.get('#historyList').find('li').should('have.length', 1);

cypress/e2e/loadSite.spec.ts

@@ -1,13 +1,11 @@
 import { toBase64 } from 'js-base64';
-import { disableDebounce } from './util';
 
 describe('Site Loads', () => {
 	beforeEach(() => {
 		cy.clearLocalStorage();
-		cy.visit('/');
-		disableDebounce();
 	});
 	it('Check Home page load', () => {
+		cy.visit('/');
 		cy.url().should('include', '/edit');
 		cy.contains('History').click();
 		cy.getLocalStorage('codeStore').snapshot();
@@ -17,7 +15,12 @@ describe('Site Loads', () => {
 		cy.visit(
 			'/#/edit/eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl0iLCJtZXJtYWlkIjp7InRoZW1lIjoiZGVmYXVsdCJ9LCJ1cGRhdGVFZGl0b3IiOmZhbHNlfQ'
 		);
-		cy.url().should('include', '/edit#pako:eNp');
+		cy.url().should(
+			'include',
+			'/edit#pako:eNpVkM1qw0AMhF9F6NRC_AI-FBo7zSXQQHLz-iC8cnZJ9oe1TAm2373rmkKrk9B8MwyasAuascRbomjgWisPed6byiQ7iKOhhaJ4m48s4ILn5wz7l2OAwYQYrb-9bvx-haCaTivGIMb6-7JJ1Y__0_MMdXOiKCG2f5XrV5jh0NizyfH_FZM4uz6ansqeio4SVJRa3KHj5MjqXHtaDQrFsGOFZV419zQ-RKHyS0bHqEn4oK2EhDnmMfAOaZRwefoOS0kj_0K1pfwFtx2XbzAdW4g'
+		);
+		cy.contains('History').click();
+		cy.getLocalStorage('codeStore').snapshot();
 	});
 
 	it('should load sample diagrams when clicked', () => {
@@ -75,7 +78,7 @@ describe('Site Loads', () => {
 
 	it('should allow persisting "securityLevel" using confirm dialogue', () => {
 		const b64State = toBase64(
-			`{"code":"graph TD\\nA[\\"<img src='https://dummyimage.com/64' width=64/>\\"]","mermaid":"{\\"securityLevel\\": \\"loose\\", \\"theme\\": \\"forest\\"}","updateEditor":true,"autoSync":true,"updateDiagram":true}`,
+			`{"code":"graph TD\\nA[\\"<img src='https://via.placeholder.com/64' width=64/>\\"]","mermaid":"{\\"securityLevel\\": \\"loose\\", \\"theme\\": \\"forest\\"}","updateEditor":true,"autoSync":true,"updateDiagram":true}`,
 			true
 		);
 		cy.on('window:confirm', () => false);
@@ -88,7 +91,6 @@ describe('Site Loads', () => {
 
 	it('should show troubleshooting steps if loading fails', () => {
 		cy.visit('/#/edit/eyJjb2RlIjoiZ3JhcGggVERcbiAg');
-		cy.reload(true);
 		cy.contains('Please Click here to Raise an issue in github.');
 	});
 
@@ -115,6 +117,7 @@ describe('Site Loads', () => {
 		cy.visit(
 			'/edit#pako:eNptkU1PwzAMhv9K5BOI9Q9EXBDbJA477YYqITcxndV8QD40weh_Jy1rGR0-OY_tV2_sEyivCSQogzGuGduAtnaixINji0bcf1WVWGfVXdMtx8M1faYm4B8sxR27JLClJd6nwK4VLTlN4bI4jMQd2pLe3C4KFhNNcLQ92jv9ADGLNoTdozc-zIV4ZDsNlud7RtVN7_5Sb_jYrFcN3iN_0pPbEqUZK3QbTP_Ojyv4NdR4bwTHlyMbPcOQ3WJ2CliBpWCRdbnLqFJDOpClGmRJNYauhtr1pS-_6bKMjebkA8hXNJFWgDn5_YdTIFPINDWdb3vu6r8BaWOZRQ'
 		);
+		cy.reload();
 		cy.contains('Animal');
 	});
 });

cypress/e2e/themes.spec.ts

@@ -32,6 +32,7 @@ describe('Test themes', () => {
 	});
 
 	describe('Test dark mode', () => {
+		// eslint-disable-next-line mocha/no-hooks-for-single-case
 		beforeEach(() => {
 			cy.clearLocalStorage();
 			cy.visit('/edit', {

cypress/e2e/util.ts

@@ -1,11 +0,0 @@
-export const cmd = `{${Cypress.platform === 'darwin' ? 'meta' : 'ctrl'}}`;
-
-export const getEditor = ({ bottom = true, newline = false } = {}) =>
-	cy
-		.get('#editor textarea:first')
-		.click()
-		.focused()
-		.type(`${bottom ? '{pageDown}' : cmd}`)
-		.type(`${newline ? '{enter}' : cmd}`);
-
-export const disableDebounce = () => cy.setLocalStorage('noDebounce', 'true');

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}\",\"updateEditor\":false,\"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.4.0",
+  "__version": "10.2.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}\",\"updateEditor\":false,\"autoSync\":false,\"updateDiagram\":false}"

package.json

@@ -2,79 +2,66 @@
 	"name": "mermaid-live-editor",
 	"version": "2.0.67",
 	"type": "module",
-	"license": "MIT",
 	"scripts": {
-		"dev": "vite dev",
-		"build": "vite build",
-		"preview": "vite preview",
+		"dev": "svelte-kit dev --host 0.0.0.0",
+		"build": "svelte-kit build",
+		"preview": "svelte-kit 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=. .",
 		"pre-commit": "lint-staged",
-		"postinstall": "husky install; cypress cache prune; svelte-kit sync",
-		"test:unit": "vitest",
-		"test:ui": "vitest --ui",
-		"test:coverage": "vitest run --coverage",
-		"test:browser": "cypress run",
-		"test": "test:unit && test:browser",
+		"postinstall": "husky install; cypress cache prune",
+		"test": "cypress run",
 		"cy": "cypress open"
 	},
 	"devDependencies": {
-		"@cypress/snapshot": "2.1.7",
-		"@sveltejs/adapter-static": "1.0.0-next.39",
-		"@sveltejs/kit": "1.0.0-next.405",
-		"@testing-library/jest-dom": "5.16.5",
-		"@testing-library/svelte": "3.1.3",
-		"@types/mermaid": "8.2.9",
-		"@types/pako": "1.0.3",
-		"@typescript-eslint/eslint-plugin": "5.33.0",
-		"@typescript-eslint/parser": "5.33.0",
-		"@vitest/ui": "0.21.1",
-		"autoprefixer": "10.4.8",
-		"c8": "7.12.0",
-		"chai": "4.3.6",
-		"cssnano": "5.1.12",
-		"cy-verify-downloads": "0.1.8",
-		"cypress": "10.4.0",
-		"cypress-localstorage-commands": "2.2.0",
-		"eslint": "8.21.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.0",
-		"eslint-plugin-vitest": "0.0.8",
-		"husky": "8.0.1",
-		"jsdom": "20.0.0",
-		"lint-staged": "13.0.3",
-		"node-html-parser": "5.4.1",
-		"postcss": "8.4.16",
-		"postcss-load-config": "4.0.1",
-		"prettier": "2.7.1",
-		"prettier-plugin-svelte": "2.7.0",
-		"svelte": "3.49.0",
+		"@cypress/snapshot": "^2.1.7",
+		"@sveltejs/adapter-static": "1.0.0-next.34",
+		"@sveltejs/kit": "1.0.0-next.355",
+		"@types/mermaid": "^8.2.9",
+		"@types/pako": "^1.0.3",
+		"@typescript-eslint/eslint-plugin": "^4.33.0",
+		"@typescript-eslint/parser": "^4.33.0",
+		"autoprefixer": "^10.4.7",
+		"chai": "^4.3.6",
+		"cssnano": "^5.1.12",
+		"cy-verify-downloads": "^0.1.8",
+		"cypress": "10.2.0",
+		"cypress-localstorage-commands": "^2.1.0",
+		"eslint": "^7.32.0",
+		"eslint-config-prettier": "^8.5.0",
+		"eslint-plugin-cypress": "^2.12.1",
+		"eslint-plugin-es": "^4.1.0",
+		"eslint-plugin-mocha": "^10.0.5",
+		"eslint-plugin-postcss-modules": "^2.0.0",
+		"eslint-plugin-svelte3": "^3.4.1",
+		"eslint-plugin-tailwindcss": "^3.5.2",
+		"husky": "^8.0.1",
+		"lint-staged": "13.0.2",
+		"mocha": "^10.0.0",
+		"node-html-parser": "^5.3.3",
+		"postcss": "^8.4.14",
+		"postcss-load-config": "^4.0.1",
+		"prettier": "~2.7.1",
+		"prettier-plugin-svelte": "^2.7.0",
+		"svelte": "^3.48.0",
 		"svelte-preprocess": "4.10.7",
-		"tailwindcss": "3.1.8",
-		"tslib": "2.4.0",
-		"typescript": "4.7.4",
-		"vite": "3.0.6",
-		"vitest": "0.21.1",
-		"vitest-svelte-kit": "0.0.7"
+		"tailwindcss": "^3.1.4",
+		"tslib": "^2.4.0",
+		"typescript": "^4.7.3"
 	},
 	"dependencies": {
-		"@analytics/google-analytics": "1.0.3",
-		"@macfja/svelte-persistent-store": "1.3.0",
-		"analytics": "0.8.1",
-		"daisyui": "2.22.0",
-		"js-base64": "3.7.2",
-		"mermaid": "9.1.5",
-		"moment": "2.29.4",
-		"monaco-editor": "0.34.0",
-		"monaco-mermaid": "1.0.6",
+		"@analytics/google-analytics": "^0.5.3",
+		"@macfja/svelte-persistent-store": "^1.3.0",
+		"analytics": "^0.8.1",
+		"daisyui": "2.17.0",
+		"js-base64": "^3.7.2",
+		"mermaid": "9.1.2",
+		"moment": "^2.29.3",
+		"monaco-editor": "^0.33.0",
+		"monaco-mermaid": "^1.0.6",
 		"pako": "2.0.4",
-		"random-word-slugs": "0.1.6",
-		"svg-pan-zoom": "^3.6.1"
+		"random-word-slugs": "^0.1.6"
 	},
 	"lint-staged": {
 		"*.{ts,svelte,js,css,md,json}": [
@@ -83,7 +70,7 @@
 		]
 	},
 	"volta": {
-		"node": "18.5.0",
+		"node": "16.15.0",
 		"yarn": "1.22.10"
 	},
 	"engines": {

src/app.html

@@ -15,38 +15,8 @@
 		<link rel="manifest" href="%sveltekit.assets%/manifest.json" />
 		<link
 			rel="stylesheet"
-			href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css"
-			integrity="sha512-HK5fgLBL+xu6dm/Ii3z4xhlSUyZgTT9tuc/hSrtw6uzJOvgRr2a9jyxxT1ely+B+xFAmJKVSTbpM/CuL7qxO8w=="
-			crossorigin="anonymous"
-			referrerpolicy="no-referrer" />
-		<link
-			rel="stylesheet"
-			href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/editor/editor.main.min.css"
-			integrity="sha512-iQEIc0rsSDujsfjtD+lfyJ1W23Bh/lbgriubKDAym6VlEIDRj9rrbSIyJRyshOrl8s0yRcQ0+gyrZfSLyjJGWQ=="
-			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.34.0/min/vs/loader.min.js"
-			integrity="sha512-6bIYsGqvLpAiEBXPdRQeFf5cueeBECtAKJjIHer3BhBZNTV3WLcLA8Tm3pDfxUwTMIS+kAZwTUvJ1IrMdX8C5w=="
-			crossorigin="anonymous"
-			referrerpolicy="no-referrer"></script>
-		<script
-			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/editor/editor.main.nls.min.js"
-			integrity="sha512-CCv+DKWw+yZhxf4Z+ExT6HC5G+3S45TeMTYcJyYbdrv4BpK2vyALJ4FoVR/KGWDIPu7w4tNCOC9MJQIkYPR5FA=="
-			crossorigin="anonymous"
-			referrerpolicy="no-referrer"></script>
-		<script
-			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/editor/editor.main.js"
-			integrity="sha512-TTPQbVI87mnVMV+1KbkKJ8vdQ4QqqbKyuTtJ9wQD8CqnwQLSQgXH7MWOQ88VO7pRzxWhqI1vYDeEV651sAH4ig=="
-			crossorigin="anonymous"
-			referrerpolicy="no-referrer"></script>
+			href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css" />
+
 		%sveltekit.head%
 	</head>
 	<body>

src/global.d.ts

@@ -1,15 +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-ignore
-			extends TestingLibraryMatchers<typeof expect.stringContaining, R> {}
-	}
-}

src/hooks.ts

@@ -1,4 +1,4 @@
-import type { Handle } from '@sveltejs/kit';
+import type { Handle } from '@sveltejs/kit/types/hooks';
 
 export const handle: Handle = async ({ event, resolve }) => {
 	const response = await resolve(event, {

src/lib/components/actions.svelte

@@ -57,7 +57,6 @@
 		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 && h.includes('font-awesome'));

src/lib/components/card/__snapshots__/card.test.ts.snap

@@ -1,3 +0,0 @@
-// Vitest Snapshot v1
-
-exports[`card.svelte > mounts 1`] = `"<div><div class=\\"card rounded overflow-hidden m-2 flex-grow flex flex-col shadow-2xl\\"><div class=\\"bg-primary p-2 pb-0 flex-none cursor-pointer\\"><div class=\\"flex justify-between\\"><div class=\\"flex cursor-default s-_wx1E_JHsCoF\\"><span class=\\"mr-2 font-semibold s-_wx1E_JHsCoF\\"><i class=\\"fas fa-chevron-right icon s-_wx1E_JHsCoF isOpen\\"></i> TabTest</span> <ul class=\\"tabs s-_wx1E_JHsCoF\\"><div class=\\"tab tab-lifted tab-active s-_wx1E_JHsCoF\\"><i class=\\"mr-1 undefined s-_wx1E_JHsCoF\\"></i> title1 </div><div class=\\"tab tab-lifted text-primary-content s-_wx1E_JHsCoF\\"><i class=\\"mr-1 undefined s-_wx1E_JHsCoF\\"></i> title2 </div></ul></div><!--<Tabs>--> <div class=\\"flex gap-x-4 items-center -mt-2\\"></div></div></div> <div class=\\"card-body p-0 flex-grow overflow-auto text-base-content\\"></div></div><!--<Card>--></div>"`;

src/lib/components/card/card.test.ts

@@ -1,24 +0,0 @@
-import { cleanup, render } from '@testing-library/svelte';
-import { describe, expect, it, afterEach } from 'vitest';
-import Card from './card.svelte';
-
-describe('card.svelte', () => {
-	// TODO: @testing-library/svelte claims to add this automatically but it doesn't work without explicit afterEach
-	afterEach(() => cleanup());
-
-	it('mounts', () => {
-		const { container } = render(Card, {
-			title: 'TabTest',
-			tabs: [
-				{ id: 't1', title: 'title1' },
-				{ id: 't2', title: 'title2' }
-			]
-		});
-		expect(container).toBeTruthy();
-		expect(container).toHaveTextContent('TabTest');
-		expect(container).toHaveTextContent('title1');
-		expect(container).toHaveTextContent('title2');
-		expect(container).not.toHaveTextContent('title3');
-		expect(container.innerHTML).toMatchSnapshot();
-	});
-});

src/lib/components/editor.svelte

@@ -2,7 +2,7 @@
 	import type { EditorEvents } from '$lib/types';
 	import { stateStore } from '$lib/util/state';
 	import { themeStore } from '$lib/util/theme';
-	import { syncDiagram } from '$lib/util/util';
+
 	import type monaco from 'monaco-editor';
 	import { createEventDispatcher, onMount } from 'svelte';
 	import initEditor from 'monaco-mermaid';
@@ -24,61 +24,67 @@
 	};
 	let oldText = text;
 	$: editor && Monaco?.editor.setModelLanguage(editor.getModel(), language);
-
-	const handleTextUpdate = (newText: string) => {
-		if (newText !== oldText) {
+	$: {
+		if (text !== oldText) {
 			if ($stateStore.updateEditor) {
-				editor?.setValue(newText);
+				editor?.setValue(text);
 			}
-			oldText = newText;
+			oldText = text;
 		}
 		editor && Monaco?.editor.setModelMarkers(editor.getModel(), 'test', $stateStore.errorMarkers);
-	};
-
-	$: handleTextUpdate(text);
+	}
 
 	themeStore.subscribe(({ isDark }) => {
 		editor && Monaco?.editor.setTheme(isDark ? 'mermaid-dark' : 'mermaid');
 	});
 
 	const dispatch = createEventDispatcher<EditorEvents>();
-	const loadMonaco = async () => {
-		let i = 0;
-		while (i++ < 10) {
-			try {
-				// @ts-ignore : This is a hack to handle a svelte-kit error when importing monaco.
-				Monaco = monaco;
-				return;
-			} catch {
-				await new Promise((r) => setTimeout(r, 500));
-			}
-		}
-		alert('Loading Monaco Editor failed. Please try refreshing the page.');
-	};
+
 	onMount(async () => {
-		try {
-			// @ts-ignore : This is a hack to handle a svelte-kit error when importing monaco.
-			Monaco = monaco;
-		} catch {
-			await loadMonaco(); // Fix https://github.com/mermaid-js/mermaid-live-editor/issues/175
-		}
+		// @ts-ignore
+		self.MonacoEnvironment = {
+			getWorker: function (workerId: string, label: string) {
+				const getWorkerModule = (moduleUrl: string, label: string): Worker => {
+					// @ts-ignore
+					return new Worker(self.MonacoEnvironment.getWorkerUrl(moduleUrl), {
+						name: label,
+						type: 'module'
+					});
+				};
+
+				switch (label) {
+					case 'json':
+						return getWorkerModule('/monaco-editor/esm/vs/language/json/json.worker?worker', label);
+					case 'css':
+					case 'scss':
+					case 'less':
+						return getWorkerModule('/monaco-editor/esm/vs/language/css/css.worker?worker', label);
+					case 'html':
+					case 'handlebars':
+					case 'razor':
+						return getWorkerModule('/monaco-editor/esm/vs/language/html/html.worker?worker', label);
+					case 'typescript':
+					case 'javascript':
+						return getWorkerModule(
+							'/monaco-editor/esm/vs/language/typescript/ts.worker?worker',
+							label
+						);
+					default:
+						return getWorkerModule('/monaco-editor/esm/vs/editor/editor.worker?worker', label);
+				}
+			}
+		};
+
+		Monaco = await import('monaco-editor');
 		initEditor(Monaco);
 		editor = Monaco.editor.create(divEl, editorOptions);
 		editor.onDidChangeModelContent(() => {
-			oldText = editor.getValue();
+			text = editor.getValue();
 			dispatch('update', {
-				text: oldText
+				text
 			});
 		});
-		editor.addAction({
-			id: 'mermaid-render-diagram',
-			label: 'Render Diagram',
-			keybindings: [Monaco.KeyMod.CtrlCmd | Monaco.KeyCode.Enter],
-			run: function () {
-				syncDiagram();
-			}
-		});
-		Monaco?.editor.setTheme($themeStore.isDark ? 'mermaid-dark' : 'mermaid');
+		Monaco.editor.setTheme($themeStore.isDark ? 'mermaid-dark' : 'mermaid');
 		const resizeObserver = new ResizeObserver((entries) => {
 			editor.layout({
 				height: entries[0].contentRect.height,

src/lib/components/preset.svelte

@@ -97,8 +97,7 @@
 	const loadSampleDiagram = (diagramType: string): void => {
 		updateCode(samples[diagramType], {
 			updateDiagram: true,
-			updateEditor: true,
-			resetPanZoom: true
+			updateEditor: true
 		});
 	};
 </script>

src/lib/components/view.svelte

@@ -1,9 +1,7 @@
 <script lang="ts">
-	import { inputStateStore, stateStore, updateCodeStore } from '$lib/util/state';
+	import { inputStateStore, stateStore } from '$lib/util/state';
 	import { onMount } from 'svelte';
 	import mermaid from 'mermaid';
-	import panzoom from 'svg-pan-zoom';
-	import type { State } from '$lib/types';
 
 	let code = '';
 	let config = '';
@@ -11,46 +9,7 @@
 	let view: HTMLDivElement;
 	let error = false;
 	let outOfSync = false;
-	let hide = false;
 	let manualUpdate = true;
-	let panZoomEnabled = $stateStore.panZoom;
-	let pzoom: SvgPanZoom.Instance;
-	let debounce: number;
-
-	const handlePanZoomChange = () => {
-		const pan = pzoom.getPan();
-		const zoom = pzoom.getZoom();
-		clearTimeout(debounce);
-		debounce = window.setTimeout(() => {
-			updateCodeStore({ pan, zoom });
-		}, 200);
-	};
-
-	const handlePanZoom = (state: State) => {
-		if (!state.panZoom) {
-			return;
-		}
-		hide = true;
-		pzoom?.destroy();
-		pzoom = undefined;
-		Promise.resolve().then(() => {
-			const graphDiv = document.getElementById('graph-div');
-			pzoom = panzoom(graphDiv, {
-				onPan: handlePanZoomChange,
-				onZoom: handlePanZoomChange,
-				controlIconsEnabled: true,
-				fit: true,
-				center: true
-			});
-			const { pan, zoom } = state;
-			if (pan !== undefined && zoom !== undefined && Number.isFinite(zoom)) {
-				pzoom.zoom(zoom);
-				pzoom.pan(pan);
-			}
-			hide = false;
-		});
-	};
-
 	onMount(() => {
 		stateStore.subscribe((state) => {
 			if (state.error !== undefined) {
@@ -65,23 +24,19 @@
 					}
 					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
+					if (code === state.code && config === state.mermaid) {
+						// Do not render if there is no change in Code/Config
 						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);
+							console.log(svgCode);
 							container.innerHTML = svgCode;
-							const graphDiv = document.getElementById('graph-div');
-							graphDiv.setAttribute('height', '100%');
-							graphDiv.style.maxWidth = '100%';
 						}
 					});
 					view.parentElement.scrollTop = scroll;
@@ -96,11 +51,6 @@
 				error = true;
 			}
 		});
-		window.addEventListener('resize', () => {
-			if ($stateStore.panZoom && pzoom) {
-				pzoom.resize();
-			}
-		});
 	});
 </script>
 
@@ -108,25 +58,16 @@
 	<div class="p-2 text-red-600" id="errorContainer">{$stateStore.error}</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 id="view" bind:this={view} class="p-2" class:error class:outOfSync>
+	<div id="container" bind:this={container} class="flex-1 overflow-auto" />
 </div>
 
 <style>
 	#view {
 		flex: 1;
 	}
-
-	#container {
-		transition: visibility 0.3s;
-	}
-
 	.error,
 	.outOfSync {
 		opacity: 0.5;
 	}
-
-	.hide {
-		visibility: hidden;
-	}
 </style>

src/lib/types.d.ts

@@ -39,14 +39,11 @@ export interface State {
 	updateEditor: boolean;
 	updateDiagram: boolean;
 	autoSync: boolean;
-	panZoom?: boolean;
-	pan?: { x: number; y: number };
-	zoom?: number;
 	loader?: LoaderConfig;
 }
 
 export interface ValidatedState extends State {
-	error: unknown;
+	error: any;
 	errorMarkers: MarkerData[];
 	serialized: string;
 }

src/lib/util/fileLoaders/gist.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -44,7 +43,6 @@ const getGistData = async (gistURL: string): Promise<GistData> => {
 		}
 		const currentItem = history[0];
 		return {
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 			url: `${html_url}/${currentItem.version}`,
 			code,
 			config,

src/lib/util/fileLoaders/loader.ts

@@ -7,7 +7,7 @@ const loaders: Record<string, Loader> = {
 
 export const loadDataFromUrl = async (): Promise<void> => {
 	const searchParams = new URLSearchParams(window.location.search);
-	let state: Partial<State> = defaultState;
+	let state: State = defaultState;
 	let code: string, config: string;
 	let loaded = false;
 	const codeURL: string = searchParams.get('code');
@@ -23,9 +23,6 @@ export const loadDataFromUrl = async (): Promise<void> => {
 		config = defaultState.mermaid;
 	}
 	if (!code) {
-		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-		// @ts-ignore
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-call
 		for (const [key, value] of searchParams.entries()) {
 			if (key in loaders) {
 				try {
@@ -48,7 +45,7 @@ export const loadDataFromUrl = async (): Promise<void> => {
 					configURL
 				}
 			}
-		};
+		} as State;
 	}
 	loaded &&
 		updateCodeStore({

src/lib/util/serde.test.ts

@@ -1,40 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { serializeState, deserializeState, type SerdeType } from './serde';
-import { defaultState } from './state';
-import type { State } from '$lib/types';
-
-describe('Serde tests', () => {
-	const verifySerde = (state: State, serde?: SerdeType): string => {
-		const serialized = serializeState(state, serde);
-		const deserialized = deserializeState(serialized);
-		expect(deserialized).to.deep.equal(state);
-		return serialized;
-	};
-
-	it('should serialize and deserialize with default serde', () => {
-		expect(verifySerde(defaultState)).toMatchInlineSnapshot(
-			'"pako:eNpVkM1qw0AMhF9F6JRC_AI-FBo7ySXQQnPz5iC8cnZp9oe1TAm2373rmEKik5j5ZhAasQ2ascRromjgXCsPeT6ayiTbi6P-AkXxPh1ZwAXP9wl2m2OA3oQYrb--rfxugaAaTwvGIMb6n3m1qkf-0_MEdXOiKCFenp3zb5hg39gvk-tfHZM4pw5NR2VHRUsJKkoPBLfoODmyOp8-LopCMexYYZlXzR0NN1Go_JzRIWoS3msrIWGuuvW8RRokfN99i6Wkgf-h2lL-hFvF-Q9-YFyS"'
-		);
-	});
-
-	it('should serialize and deserialize with base64 serde', () => {
-		expect(verifySerde(defaultState, 'base64')).toMatchInlineSnapshot(
-			'"base64:eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cbiAgIiwibWVybWFpZCI6IntcbiAgXCJ0aGVtZVwiOiBcImRlZmF1bHRcIlxufSIsInVwZGF0ZUVkaXRvciI6ZmFsc2UsImF1dG9TeW5jIjp0cnVlLCJ1cGRhdGVEaWFncmFtIjp0cnVlfQ"'
-		);
-	});
-
-	it('should serialize and deserialize with pako serde', () => {
-		expect(verifySerde(defaultState, 'pako')).toMatchInlineSnapshot(
-			'"pako:eNpVkM1qw0AMhF9F6JRC_AI-FBo7ySXQQnPz5iC8cnZp9oe1TAm2373rmEKik5j5ZhAasQ2ascRromjgXCsPeT6ayiTbi6P-AkXxPh1ZwAXP9wl2m2OA3oQYrb--rfxugaAaTwvGIMb6n3m1qkf-0_MEdXOiKCFenp3zb5hg39gvk-tfHZM4pw5NR2VHRUsJKkoPBLfoODmyOp8-LopCMexYYZlXzR0NN1Go_JzRIWoS3msrIWGuuvW8RRokfN99i6Wkgf-h2lL-hFvF-Q9-YFyS"'
-		);
-	});
-
-	it('should throw error for unrecognized serde', () => {
-		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-		// @ts-expect-error
-		expect(() => serializeState(defaultState, 'unknown')).toThrowError(
-			'Unknown serde type: unknown'
-		);
-		expect(() => deserializeState('unknown:hello')).toThrowError('Unknown serde type: unknown');
-	});
-});

src/lib/util/serde.ts

@@ -28,20 +28,18 @@ export const pakoSerde: Serde = {
 	}
 };
 
-export type SerdeType = 'base64' | 'pako';
-
-const serdes: { [key in SerdeType]: Serde } = {
+const serdes: { [key: string]: Serde } = {
 	base64: base64Serde,
 	pako: pakoSerde
 };
 
-export const serializeState = (state: State, serde: SerdeType = 'pako'): string => {
-	if (serdes[serde] === undefined) {
-		throw new Error(`Unknown serde type: ${serde}`);
-	}
+type SerdeType = keyof typeof serdes;
+
+export const serializeState = (state: State): string => {
 	const json = JSON.stringify(state);
-	const serialized = serdes[serde].serialize(json);
-	return `${serde}:${serialized}`;
+	const defaultSerde: SerdeType = 'pako';
+	const serialized = serdes[defaultSerde].serialize(json);
+	return `${defaultSerde}:${serialized}`;
 };
 
 export const deserializeState = (state: string): State => {
@@ -50,7 +48,7 @@ export const deserializeState = (state: string): State => {
 		let tempType: string;
 		[tempType, serialized] = state.split(':');
 		if (tempType in serdes) {
-			type = tempType as SerdeType;
+			type = tempType;
 		} else {
 			throw new Error(`Unknown serde type: ${tempType}`);
 		}

src/lib/util/state.ts

@@ -2,7 +2,6 @@ import { writable, get, derived } from 'svelte/store';
 import { persist, localStorage } from '@macfja/svelte-persistent-store';
 import { saveStatistics } from './stats';
 import { serializeState, deserializeState } from './serde';
-import { cmdKey } from './util';
 import mermaid from 'mermaid';
 
 import type { Readable } from 'svelte/store';
@@ -79,7 +78,7 @@ export const stateStore: Readable<ValidatedState> = derived([inputStateStore], (
 
 export const loadState = (data: string): void => {
 	let state: State;
-	console.log(`Loading '${data}'`);
+	console.log('Loading', data);
 	try {
 		state = deserializeState(data);
 		const mermaidConfig: { [key: string]: string } =
@@ -105,7 +104,7 @@ export const loadState = (data: string): void => {
 	updateCodeStore({ ...state, updateEditor: true });
 };
 
-export const updateCodeStore = (newState: Partial<State>): void => {
+export const updateCodeStore = (newState: State): void => {
 	inputStateStore.update((state) => {
 		return { ...state, ...newState };
 	});
@@ -114,32 +113,24 @@ export const updateCodeStore = (newState: Partial<State>): void => {
 let prompted = false;
 export const updateCode = (
 	code: string,
-	{
-		updateEditor,
-		updateDiagram = false,
-		resetPanZoom = false
-	}: { updateEditor: boolean; updateDiagram?: boolean; resetPanZoom?: boolean }
+	{ updateEditor, updateDiagram = false }: { updateEditor: boolean; updateDiagram?: boolean }
 ): void => {
 	saveStatistics(code);
 	const lines = (code.match(/\n/g) || '').length + 1;
 
 	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.`
+			'Long diagram detected. Turn off Auto Sync? Click the sync logo to manually sync.'
 		);
 		prompted = true;
 		if (turnOff) {
 			updateCodeStore({
 				autoSync: false
-			});
+			} as State);
 		}
 	}
 
 	inputStateStore.update((state) => {
-		if (resetPanZoom) {
-			state.pan = undefined;
-			state.zoom = undefined;
-		}
 		return { ...state, code, updateEditor, updateDiagram };
 	});
 };

src/lib/util/util.ts

@@ -1,3 +1,4 @@
+import type { State } from '$lib/types';
 import { initURLSubscription, loadState, updateCodeStore } from './state';
 import { analytics, initAnalytics } from './stats';
 import { loadDataFromUrl } from './fileLoaders/loader';
@@ -10,7 +11,7 @@ export const loadStateFromURL = (): void => {
 export const syncDiagram = (): void => {
 	updateCodeStore({
 		updateDiagram: true
-	});
+	} as State);
 };
 
 export const initHandler = async (): Promise<void> => {
@@ -21,8 +22,3 @@ export const initHandler = async (): Promise<void> => {
 	await initAnalytics();
 	analytics?.page();
 };
-
-export const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
-export const cmdKey = isMac ? 'Cmd' : 'Ctrl';
-
-export const debounceEnabled = window.localStorage.getItem('noDebounce') !== 'true';

src/routes/[fallback]/manifest.json.ts

@@ -1,2 +1,2 @@
-import { GET as manifestGet } from '../manifest.json';
-export const GET = manifestGet;
+import { get as manifestGet } from '../manifest.json';
+export const get = manifestGet;

src/routes/__layout.svelte

@@ -5,14 +5,10 @@
 	import { loadingStateStore } from '$lib/util/loading';
 	import { setTheme, themeStore } from '$lib/util/theme';
 	import { toggleDarkTheme } from '$lib/util/state';
-	import { initHandler } from '$lib/util/util';
 
 	// This can be removed once https://github.com/sveltejs/kit/issues/1612 is fixed.
 	// Then move it into src and vite will bundle it automatically.
 	onMount(() => {
-		window.addEventListener('hashchange', async (ev) => {
-			await initHandler();
-		});
 		if ('serviceWorker' in navigator) {
 			navigator.serviceWorker
 				.register(`${base}/service-worker.js`, {

src/routes/edit.svelte

@@ -7,7 +7,7 @@
 	import Card from '$lib/components/card/card.svelte';
 	import History from '$lib/components/history/history.svelte';
 	import { updateCode, updateConfig, inputStateStore, stateStore } from '$lib/util/state';
-	import { cmdKey, debounceEnabled, initHandler, syncDiagram } from '$lib/util/util';
+	import { initHandler, syncDiagram } from '$lib/util/util';
 	import { onMount } from 'svelte';
 	import type { EditorUpdateEvent, State, Tab, DocConfig } from '$lib/types';
 	import { base } from '$app/paths';
@@ -63,15 +63,14 @@
 	let text = '';
 	let docURL = docURLBase;
 	let language: Languages = 'mermaid';
-	const handleModeUpdate = (mode: Modes) => {
-		if (mode === 'code') {
+	$: language = languageMap[selectedMode];
+	$: {
+		if (selectedMode === 'code') {
 			text = $stateStore.code;
 		} else {
 			text = $stateStore.mermaid;
 		}
-	};
-	$: language = languageMap[selectedMode];
-	$: handleModeUpdate(selectedMode);
+	}
 
 	stateStore.subscribe((state: State) => {
 		if (state.updateEditor) {
@@ -101,27 +100,19 @@
 		}
 	];
 
-	const handleUpdate = (text: string) => {
+	const updateHandler = (message: CustomEvent<EditorUpdateEvent>) => {
+		const code = message.detail.text;
 		if (selectedMode === 'code') {
-			updateCode(text, {
+			updateCode(code, {
 				updateEditor: false
 			});
 		} else {
-			updateConfig(text, false);
+			updateConfig(code, false);
 		}
 	};
 
-	let debounce: { [key: string]: number } = {};
-	const updateHandler = ({ detail: { text } }: CustomEvent<EditorUpdateEvent>) => {
-		console.log({ debounceEnabled });
-		if (debounceEnabled) {
-			clearTimeout(debounce[selectedMode]);
-			debounce[selectedMode] = window.setTimeout(() => {
-				handleUpdate(text);
-			}, 300);
-		} else {
-			handleUpdate(text);
-		}
+	const viewDiagram = () => {
+		window.open(`${base}/view#${$stateStore.serialized}`, '_blank').focus();
 	};
 
 	onMount(async () => {
@@ -151,32 +142,34 @@
 	<div class="flex-1 flex overflow-hidden">
 		<div class="hidden md:flex flex-col" id="editorPane" style="width: 40%">
 			<Card on:select={tabSelectHandler} {tabs} isCloseable={false} 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">
-							<span> Auto sync</span>
-							<input
-								type="checkbox"
-								class="toggle {$stateStore.autoSync ? 'btn-secondary' : 'toggle-primary'} ml-1"
-								id="autoSync"
-								bind:checked={$inputStateStore.autoSync} />
-						</label>
+				<div slot="actions">
+					<div class="flex flex-row items-center">
+						<div class="form-control flex-row items-center">
+							<label class="cursor-pointer label" for="autoSync">
+								<span> Auto sync</span>
+								<input
+									type="checkbox"
+									class="toggle {$stateStore.autoSync ? 'btn-secondary' : 'toggle-primary'} ml-1"
+									id="autoSync"
+									bind:checked={$inputStateStore.autoSync} />
+							</label>
+						</div>
+
+						{#if !$stateStore.autoSync}
+							<button
+								class="btn btn-secondary btn-xs mr-1"
+								title="Sync Diagram"
+								data-cy="sync"
+								on:click={syncDiagram}><i class="fas fa-sync" /></button>
+						{/if}
+
+						<button class="btn btn-secondary btn-xs" title="View documentation">
+							<a target="_blank" href={docURL} data-cy="docs"><i class="fas fa-book mr-1" />Docs</a>
+						</button>
 					</div>
-
-					{#if !$stateStore.autoSync}
-						<button
-							class="btn btn-secondary btn-xs mr-1"
-							title="Sync Diagram ({cmdKey} + Enter)"
-							data-cy="sync"
-							on:click={syncDiagram}><i class="fas fa-sync" /></button>
-					{/if}
-
-					<button class="btn btn-secondary btn-xs" title="View documentation">
-						<a target="_blank" href={docURL} data-cy="docs"><i class="fas fa-book mr-1" />Docs</a>
-					</button>
 				</div>
 
-				<Editor on:update={updateHandler} {language} {text} />
+				<Editor on:update={updateHandler} {language} bind:text />
 			</Card>
 
 			<div class="-mt-2">
@@ -188,22 +181,11 @@
 		<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">
-					<label class="cursor-pointer label py-0" for="panZoom">
-						<span>Pan & Zoom</span>
-						<input
-							type="checkbox"
-							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"
-						title="View diagram in new page"
-						><i class="fas fa-external-link-alt mr-1" />Full screen</a>
-				</div>
+				<button
+					slot="actions"
+					class="btn btn-secondary btn-xs"
+					title="View diagram in new page"
+					on:click|stopPropagation={() => viewDiagram()}><i class="far fa-eye mr-1" />View</button>
 
 				<div class="flex-1 overflow-auto">
 					<View />

src/routes/manifest.json.ts

@@ -1,5 +1,5 @@
 import { base } from '$app/paths';
-export const GET = (): { body: unknown } => {
+export const get = (): { body: unknown } => {
 	return {
 		body: {
 			short_name: 'Mermaid',

src/tests/setup.ts

@@ -1,4 +0,0 @@
-import matchers from '@testing-library/jest-dom/matchers';
-import { expect } from 'vitest';
-
-expect.extend(matchers);

svelte.config.js

@@ -12,7 +12,8 @@ const config = {
 	],
 	kit: {
 		adapter: adapter({
-			pages: `docs`
+			pages: `docs`,
+			precompress: true
 		}),
 		paths: process.env['DEPLOY']
 			? {
@@ -20,6 +21,10 @@ const config = {
 			  }
 			: {},
 		trailingSlash: 'ignore',
+		vite: {
+			envPrefix: 'MERMAID_',
+			optimizeDeps: { include: ['mermaid'] }
+		},
 		prerender: {
 			default: true
 		}

tsconfig.json

@@ -8,9 +8,7 @@
 		"static/**/*.js"
 	],
 	"compilerOptions": {
-		"resolveJsonModule": true,
-		"allowSyntheticDefaultImports": true,
-		"types": ["vitest/importMeta"]
+		"allowSyntheticDefaultImports": true
 	},
 	"extends": "./.svelte-kit/tsconfig.json"
 }

vite.config.js

@@ -1,29 +0,0 @@
-import { sveltekit } from '@sveltejs/kit/vite';
-/** @type {import('vite').UserConfig} */
-const config = {
-	plugins: [sveltekit()],
-	envPrefix: 'MERMAID_',
-	optimizeDeps: { include: ['mermaid'] },
-	ssr: {
-		noExternal: ['@macfja/svelte-persistent-store']
-	},
-	server: {
-		port: 3000,
-		host: true
-	},
-	preview: {
-		port: 3000,
-		host: true
-	},
-	test: {
-		environment: 'jsdom',
-		// in-source testing
-		includeSource: ['src/**/*.{js,ts,svelte}'],
-		setupFiles: ['./src/tests/setup.ts'],
-		coverage: {
-			exclude: ['src/mocks', '.svelte-kit', 'src/**/*.test.ts'],
-			reporter: ['text', 'json', 'html', 'lcov']
-		}
-	}
-};
-export default config;