Remove scroll

Develop

.eslintignore

@@ -0,0 +1,8 @@
+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'],
+	plugins: ['svelte3', 'tailwindcss', '@typescript-eslint', 'es', 'vitest'],
 	ignorePatterns: [
 		'docs/*',
 		'*.cjs',

.github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: Cypress Tests
+name: Tests
 
 on:
   pull_request:
@@ -30,17 +30,18 @@ jobs:
           node-version: 16
           cache: 'yarn'
 
-      - name: Build & Lint
+      - name: Lint & Test
         run: |
           yarn install
-          yarn build
           yarn lint
+          yarn test:unit
 
       # 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

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

@@ -10,7 +10,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - run: ./bin/update-monaco
+      - uses: actions/setup-node@v2
+        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:

.prettierignore

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

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+	// 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.4.0 as mermaid-live-editor-builder 
+FROM node:18.6.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

@@ -1,12 +0,0 @@
-#!/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

@@ -0,0 +1,45 @@
+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/.eslintrc

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

cypress/e2e/diagramUpdate.spec.ts

@@ -1,4 +1,13 @@
 describe('Auto sync tests', () => {
+	const cmd = Cypress.platform === 'darwin' ? 'meta' : 'ctrl';
+	const getEditor = ({ bottom = true, newline = false } = {}) =>
+		cy
+			.get('#editor textarea:first')
+			.click()
+			.focused()
+			.type(`${bottom ? '{pageDown}' : `{${cmd}}`}`)
+			.type(`${newline ? '{enter}' : `{${cmd}}`}`);
+
 	beforeEach(() => {
 		cy.clearLocalStorage();
 		cy.visit('/');
@@ -7,7 +16,7 @@ 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('#editor').type('  C --> Test');
+		getEditor().type('  C --> Test');
 		cy.get('#view').should('have.class', 'outOfSync');
 		cy.getLocalStorage('codeStore').snapshot();
 	});
@@ -19,26 +28,25 @@ 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');
-		cy.get('#editor').type('  C --> Test');
+		getEditor().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();
-		cy.get('#editor').type('ing');
+		getEditor().type('ing');
 		cy.get('#view').should('not.have.class', 'outOfSync');
 		cy.getLocalStorage('codeStore').snapshot();
 	});
 
 	it('supports commenting code out/in', () => {
-		const cmd = Cypress.platform === 'darwin' ? 'meta' : 'ctrl';
-
-		cy.get('#editor').type(`{uparrow}{${cmd}}/`);
+		getEditor().type(`{uparrow}{${cmd}}/`);
 		cy.get('#view').contains('Car').should('not.exist');
 
-		cy.get('#editor').type(`{uparrow}{${cmd}}/`);
+		getEditor().type(`{uparrow}{${cmd}}/`);
 		cy.get('#view').contains('Car').should('exist');
 	});
 
@@ -46,7 +54,8 @@ describe('Auto sync tests', () => {
 		cy.visit(
 			'/edit#pako:eNpljjEKwzAMRa8SNOcEnlt6gK5eVFvYJsgOqkwpIXevg9smEE1PnyfxF3DFExgISW-CczQ2D21cYU7a-SGYXRwyvTp9jUhuKlVP-eHy7zA-leQsMEmg_QOM0BLG5FujZVMsaCQmC6ahR5ks2Lw2r84ela4-aREwKpVGwKrl_s7ut3fnkjAIcg_XDzuaUhs'
 		);
-		cy.get('#editor').type(`{enter}branch test`);
+		cy.get('#errorContainer').should('not.exist');
+		getEditor({ newline: true }).type(`branch test`);
 		cy.get('#editor').contains('branch test').should('exist');
 		cy.get('#errorContainer')
 			.contains(

cypress/e2e/history.spec.ts

@@ -47,7 +47,6 @@ describe('Save History', () => {
 	});
 
 	// TODO: Fix #639
-	// eslint-disable-next-line mocha/no-skipped-tests
 	xit('should auto save history', () => {
 		cy.get('#editor').type('  C --> HistoryTest');
 		cy.tick(70000);

cypress/e2e/themes.spec.ts

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

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.2.0",
+  "__version": "10.3.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

@@ -1,67 +1,79 @@
 {
 	"name": "mermaid-live-editor",
 	"version": "2.0.67",
+	"type": "module",
+	"license": "MIT",
 	"scripts": {
-		"dev": "svelte-kit dev --host 0.0.0.0",
-		"build": "svelte-kit build",
-		"preview": "svelte-kit preview",
+		"dev": "vite dev --host 0.0.0.0",
+		"build": "vite build",
+		"preview": "vite preview",
 		"lint": "prettier --check --cache --plugin-search-dir=. .;eslint --ignore-path .gitignore .",
 		"lint:fix": "prettier --write --cache --plugin-search-dir=. .;eslint --fix --ignore-path .gitignore .",
 		"format": "prettier --write --cache --plugin-search-dir=. .",
 		"pre-commit": "lint-staged",
-		"postinstall": "husky install; cypress cache prune",
-		"test": "cypress run",
+		"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",
 		"cy": "cypress open"
 	},
 	"devDependencies": {
-		"@cypress/snapshot": "^2.1.7",
-		"@sveltejs/adapter-static": "1.0.0-next.34",
-		"@sveltejs/kit": "1.0.0-next.354",
-		"@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",
+		"@cypress/snapshot": "2.1.7",
+		"@sveltejs/adapter-static": "1.0.0-next.38",
+		"@sveltejs/kit": "1.0.0-next.390",
+		"@testing-library/jest-dom": "5.16.4",
+		"@testing-library/svelte": "3.1.3",
+		"@types/mermaid": "8.2.9",
+		"@types/pako": "1.0.3",
+		"@typescript-eslint/eslint-plugin": "5.30.7",
+		"@typescript-eslint/parser": "5.30.7",
+		"@vitest/ui": "0.18.1",
+		"autoprefixer": "10.4.7",
+		"c8": "7.12.0",
+		"chai": "4.3.6",
+		"cssnano": "5.1.12",
+		"cy-verify-downloads": "0.1.8",
+		"cypress": "10.3.1",
+		"cypress-localstorage-commands": "2.1.0",
+		"eslint": "8.20.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.3.3",
+		"postcss": "8.4.14",
+		"postcss-load-config": "4.0.1",
+		"prettier": "2.7.1",
+		"prettier-plugin-svelte": "2.7.0",
+		"svelte": "3.49.0",
 		"svelte-preprocess": "4.10.7",
-		"tailwindcss": "^3.1.4",
-		"tslib": "^2.4.0",
-		"typescript": "^4.7.3"
+		"tailwindcss": "3.1.6",
+		"tslib": "2.4.0",
+		"typescript": "4.7.4",
+		"vite": "^3.0.2",
+		"vitest": "0.18.1",
+		"vitest-svelte-kit": "0.0.6"
 	},
-	"type": "module",
 	"dependencies": {
-		"@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",
+		"@analytics/google-analytics": "1.0.2",
+		"@macfja/svelte-persistent-store": "1.3.0",
+		"analytics": "0.8.1",
+		"daisyui": "2.19.1",
+		"js-base64": "3.7.2",
+		"mermaid": "9.1.3",
+		"moment": "2.29.4",
+		"monaco-editor": "0.33.0",
+		"monaco-mermaid": "1.0.6",
 		"pako": "2.0.4",
-		"random-word-slugs": "^0.1.6"
+		"random-word-slugs": "0.1.6"
 	},
 	"lint-staged": {
 		"*.{ts,svelte,js,css,md,json}": [
@@ -70,7 +82,7 @@
 		]
 	},
 	"volta": {
-		"node": "16.15.0",
+		"node": "18.5.0",
 		"yarn": "1.22.10"
 	},
 	"engines": {

src/app.html

@@ -15,30 +15,38 @@
 		<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" />
+			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.33.0/min/vs/editor/editor.main.min.css"
+			integrity="sha512-633RnebxsjmF57QUx9c85T6XILSAuJFzKnN5dVsUQ3nsc7c0bW649fCj1Z8ZkAbo5vAHnKZIsGqDokJRiABupA=="
 			crossorigin="anonymous"
 			referrerpolicy="no-referrer" />
 		<script>
 			var require = {
-				paths: { vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.33.0/min/vs' }
+				paths: {
+					vs: "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.33.0/min/vs",
+				},
 			};
 		</script>
 		<script
 			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.33.0/min/vs/loader.min.js"
+			integrity="sha512-O9SYDgWAM3bEzit1z6mkFd+dxKUplO/oB8UwYGAkg2Zy/WzDUQ2mYA/ysk3c0CxiXAN4u8T9JeZ0Ahk2Jj/33Q=="
 			crossorigin="anonymous"
 			referrerpolicy="no-referrer"></script>
 		<script
 			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.33.0/min/vs/editor/editor.main.nls.min.js"
+			integrity="sha512-TShm8t61Zg9dutpJGD4KMy+VO4yVW0pgvHfeFjovzp+kBcSpblO7mBGSbL2ncApu0FfiqHiygwcef65+qiLRxg=="
 			crossorigin="anonymous"
 			referrerpolicy="no-referrer"></script>
 		<script
 			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.33.0/min/vs/editor/editor.main.js"
+			integrity="sha512-7p8WMGQI2IAHj9dn6uYYQYGsHNlpMp8Wv4Q1M0SNxM+8Rd16sHL7gXmktieLjh1iyWl41doD6NOiId7e+XCw6Q=="
 			crossorigin="anonymous"
 			referrerpolicy="no-referrer"></script>
-
 		%sveltekit.head%
 	</head>
 	<body>

src/global.d.ts

@@ -1 +1,15 @@
+/* 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/types/hooks';
+import type { Handle } from '@sveltejs/kit';
 
 export const handle: Handle = async ({ event, resolve }) => {
 	const response = await resolve(event, {

src/lib/components/actions.svelte

@@ -57,6 +57,7 @@
 		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

@@ -0,0 +1,3 @@
+// 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

@@ -0,0 +1,24 @@
+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/view.svelte

@@ -30,7 +30,6 @@
 					}
 					code = state.code;
 					config = state.mermaid;
-					const scroll = view.parentElement.scrollTop;
 					delete container.dataset.processed;
 					mermaid.initialize(Object.assign({}, JSON.parse(state.mermaid)));
 					mermaid.render('graph-div', code, (svgCode) => {
@@ -39,7 +38,6 @@
 							container.innerHTML = svgCode;
 						}
 					});
-					view.parentElement.scrollTop = scroll;
 					error = false;
 				} else if (manualUpdate) {
 					manualUpdate = false;

src/lib/types.d.ts

@@ -43,7 +43,7 @@ export interface State {
 }
 
 export interface ValidatedState extends State {
-	error: any;
+	error: unknown;
 	errorMarkers: MarkerData[];
 	serialized: string;
 }

src/lib/util/fileLoaders/gist.ts

@@ -1,3 +1,4 @@
+/* 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 */
@@ -43,6 +44,7 @@ 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

@@ -23,6 +23,9 @@ 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 {

src/lib/util/serde.test.ts

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

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/edit.svelte

@@ -111,10 +111,6 @@
 		}
 	};
 
-	const viewDiagram = () => {
-		window.open(`${base}/view#${$stateStore.serialized}`, '_blank').focus();
-	};
-
 	onMount(async () => {
 		await initHandler();
 		const resizer = document.getElementById('resizeHandler');
@@ -181,11 +177,13 @@
 		<div id="resizeHandler" class="hidden md:block" />
 		<div class="flex-1 flex flex-col overflow-hidden">
 			<Card title="Diagram" isCloseable={false}>
-				<button
+				<a
+					href={`${base}/view#${$stateStore.serialized}`}
+					target="_blank"
 					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>
+					><i class="fas fa-external-link-alt mr-1" />Full screen</a>
 
 				<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

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

svelte.config.js

@@ -20,10 +20,6 @@ const config = {
 			  }
 			: {},
 		trailingSlash: 'ignore',
-		vite: {
-			envPrefix: 'MERMAID_',
-			optimizeDeps: { include: ['mermaid'] }
-		},
 		prerender: {
 			default: true
 		}

tsconfig.json

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

vite.config.js

@@ -0,0 +1,24 @@
+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']
+	},
+	preview: {
+		port: 3000
+	},
+	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;