Merge pull request #840 from mermaid-js/develop

Update mermaid to 9.1.2

.gitignore

@@ -9,6 +9,5 @@ yarn-error.log
 /build
 /functions
 /snapshots.js
-/cypress/downloads
 /cypress/videos
 /cypress/screenshots

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.3.0 as mermaid-live-editor-builder 
 COPY --chown=node:node . /home
 WORKDIR /home
 RUN yarn install

cypress.config.js

@@ -1,6 +1,6 @@
 import { defineConfig } from 'cypress';
 import fs from 'fs';
-import { isFileExist, findFiles } from 'cy-verify-downloads';
+
 export default defineConfig({
 	projectId: '2ckppp',
 	viewportWidth: 1440,
@@ -11,16 +11,11 @@ export default defineConfig({
 	e2e: {
 		setupNodeEvents(on, config) {
 			on('task', {
-				isFileExist,
-				findFiles,
-				deleteFile(path) {
-					fs.rmSync(path);
-					return null;
-				},
 				readFileMaybe(filename) {
 					if (fs.existsSync(filename)) {
 						return fs.readFileSync(filename, 'utf8');
 					}
+
 					return null;
 				}
 			});

cypress/e2e/actions.spec.ts

@@ -3,7 +3,6 @@ describe('Check actions', () => {
 		cy.clearLocalStorage();
 		cy.visit('/edit');
 	});
-
 	it('should update markdown code', () => {
 		cy.get('#markdown')
 			.invoke('val')
@@ -22,33 +21,4 @@ describe('Check actions', () => {
 		cy.contains('Load Gist').click();
 		cy.contains('Go shopping!!');
 	});
-
-	it('should download png and svg', () => {
-		const now = new Date(2022, 0, 1).getTime();
-		cy.clock(now);
-		const downloadsFolder = Cypress.config('downloadsFolder');
-
-		const verifyFileSize = (fileType: string, size: number) => {
-			cy.get(`#download${fileType.toUpperCase()}`).click();
-			const fileName = `mermaid-diagram-2022-01-01-000000.${fileType}`;
-			const filePath = `${downloadsFolder}/${fileName}`;
-			cy.verifyDownload(fileName);
-			cy.readFile(filePath, null, {
-				log: false
-			}).then((buffer) => expect((buffer as ArrayBuffer).byteLength).to.be.gt(size));
-			cy.task('deleteFile', filePath);
-		};
-
-		verifyFileSize('png', 21_000);
-		verifyFileSize('svg', 11_000);
-
-		// Verify downloaded file is different for different diagrams
-		cy.contains('Sample Diagrams').click();
-		cy.contains('ER Diagram').click();
-
-		verifyFileSize('png', 46_000);
-		verifyFileSize('svg', 12_000);
-
-		cy.clock().invoke('restore');
-	});
 });

cypress/e2e/diagramUpdate.spec.ts

@@ -3,7 +3,6 @@ describe('Auto sync tests', () => {
 		cy.clearLocalStorage();
 		cy.visit('/');
 	});
-
 	it('should dim diagram when code is edited', () => {
 		cy.contains('Auto sync').click();
 		cy.get('#view').should('not.have.class', 'outOfSync');
@@ -41,17 +40,4 @@ describe('Auto sync tests', () => {
 		cy.get('#editor').type(`{uparrow}{${cmd}}/`);
 		cy.get('#view').contains('Car').should('exist');
 	});
-
-	it('supports editing code when code is incorrect', () => {
-		cy.visit(
-			'/edit#pako:eNpljjEKwzAMRa8SNOcEnlt6gK5eVFvYJsgOqkwpIXevg9smEE1PnyfxF3DFExgISW-CczQ2D21cYU7a-SGYXRwyvTp9jUhuKlVP-eHy7zA-leQsMEmg_QOM0BLG5FujZVMsaCQmC6ahR5ks2Lw2r84ela4-aREwKpVGwKrl_s7ut3fnkjAIcg_XDzuaUhs'
-		);
-		cy.get('#editor').type(`{enter}branch test`);
-		cy.get('#editor').contains('branch test').should('exist');
-		cy.get('#errorContainer')
-			.contains(
-				'Error: Trying to checkout branch which is not yet created. (Help try using "branch master")'
-			)
-			.should('exist');
-	});
 });

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.0.3",
   "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}"

cypress/support/e2e.js

@@ -15,7 +15,6 @@
 
 // Import commands.js using ES2015 syntax:
 import './commands';
-require('cy-verify-downloads').addCustomCommand();
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')

cypress/tsconfig.json

@@ -1,7 +1,7 @@
 {
 	"compilerOptions": {
 		"allowJs": true,
-		"types": ["cypress", "cypress-localstorage-commands", "cy-verify-downloads"]
+		"types": ["cypress", "cypress-localstorage-commands"]
 	},
 	"include": ["**/*.ts"]
 }

package.json

@@ -5,9 +5,9 @@
 		"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": "prettier --check --plugin-search-dir=. .;eslint --ignore-path .gitignore .",
-		"lint:fix": "prettier --write --cache --plugin-search-dir=. .;eslint --fix --ignore-path .gitignore .",
+		"lint:fix": "prettier --write --plugin-search-dir=. .;eslint --fix --ignore-path .gitignore .",
-		"format": "prettier --write --cache --plugin-search-dir=. .",
+		"format": "prettier --write --plugin-search-dir=. .",
 		"pre-commit": "lint-staged",
 		"postinstall": "husky install; cypress cache prune",
 		"test": "cypress run",
@@ -16,16 +16,15 @@
 	"devDependencies": {
 		"@cypress/snapshot": "^2.1.7",
 		"@sveltejs/adapter-static": "1.0.0-next.34",
-		"@sveltejs/kit": "1.0.0-next.354",
+		"@sveltejs/kit": "1.0.0-next.350",
 		"@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",
+		"cssnano": "^5.1.11",
-		"cy-verify-downloads": "^0.1.8",
+		"cypress": "10.0.3",
-		"cypress": "10.2.0",
 		"cypress-localstorage-commands": "^2.1.0",
 		"eslint": "^7.32.0",
 		"eslint-config-prettier": "^8.5.0",
@@ -36,16 +35,16 @@
 		"eslint-plugin-svelte3": "^3.4.1",
 		"eslint-plugin-tailwindcss": "^3.5.2",
 		"husky": "^8.0.1",
-		"lint-staged": "13.0.2",
+		"lint-staged": "13.0.1",
 		"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": "~2.6.2",
 		"prettier-plugin-svelte": "^2.7.0",
 		"svelte": "^3.48.0",
 		"svelte-preprocess": "4.10.7",
-		"tailwindcss": "^3.1.4",
+		"tailwindcss": "^3.1.1",
 		"tslib": "^2.4.0",
 		"typescript": "^4.7.3"
 	},
@@ -54,12 +53,12 @@
 		"@analytics/google-analytics": "^0.5.3",
 		"@macfja/svelte-persistent-store": "^1.3.0",
 		"analytics": "^0.8.1",
-		"daisyui": "2.17.0",
+		"daisyui": "2.15.2",
 		"js-base64": "^3.7.2",
 		"mermaid": "9.1.2",
 		"moment": "^2.29.3",
 		"monaco-editor": "^0.33.0",
-		"monaco-mermaid": "^1.0.6",
+		"monaco-mermaid": "^1.0.4",
 		"pako": "2.0.4",
 		"random-word-slugs": "^0.1.6"
 	},

src/lib/components/actions.svelte

@@ -4,20 +4,17 @@
 	import Card from '$lib/components/card/card.svelte';
 	import { krokiRendererUrl, rendererUrl } from '$lib/util/env';
 	import { pakoSerde } from '$lib/util/serde';
-	import { stateStore } from '$lib/util/state';
+	import { serializedState, codeStore } from '$lib/util/state';
 	import { toBase64 } from 'js-base64';
 	import moment from 'moment';
 
 	type Exporter = (context: CanvasRenderingContext2D, image: HTMLImageElement) => () => void;
 
-	const getFileName = (ext: string) =>
-		`mermaid-diagram-${moment().format('YYYY-MM-DD-HHmmss')}.${ext}`;
-
 	const getBase64SVG = (svg?: HTMLElement, width?: number, height?: number): string => {
 		svg?.setAttribute('height', `${height}px`);
 		svg?.setAttribute('width', `${width}px`); // Workaround https://stackoverflow.com/questions/28690643/firefox-error-rendering-an-svg-image-to-html5-canvas-with-drawimage
 		if (!svg) {
-			svg = getSvgEl();
+			svg = document.querySelector('#container svg');
 		}
 		const svgString = svg.outerHTML
 			.replaceAll('<br>', '<br/>')
@@ -53,22 +50,6 @@
 		event.preventDefault();
 	};
 
-	const getSvgEl = () => {
-		const svgEl: HTMLElement = document
-			.querySelector('#container svg')
-			.cloneNode(true) as HTMLElement;
-		const fontAwesomeCdnUrl = Array.from(document.head.getElementsByTagName('link'))
-			.map((l) => l.href)
-			.find((h) => h && h.includes('font-awesome'));
-		if (fontAwesomeCdnUrl == null) {
-			return svgEl;
-		}
-		const styleEl = document.createElement('style');
-		styleEl.innerText = `@import url("${fontAwesomeCdnUrl}");'`;
-		svgEl.prepend(styleEl);
-		return svgEl;
-	};
-
 	const simulateDownload = (download: string, href: string): void => {
 		const a = document.createElement('a');
 		a.download = download;
@@ -81,7 +62,7 @@
 			const { canvas } = context;
 			context.drawImage(image, 0, 0, canvas.width, canvas.height);
 			simulateDownload(
-				getFileName('png'),
+				`mermaid-diagram-${moment().format('YYYYMMDDHHmmss')}.png`,
 				canvas.toDataURL('image/png').replace('image/png', 'image/octet-stream')
 			);
 		};
@@ -121,7 +102,10 @@
 	};
 
 	const onDownloadSVG = () => {
-		simulateDownload(getFileName('svg'), `data:image/svg+xml;base64,${getBase64SVG()}`);
+		simulateDownload(
+			`mermaid-diagram-${moment().format('YYYYMMDDHHmmss')}.svg`,
+			`data:image/svg+xml;base64,${getBase64SVG()}`
+		);
 	};
 
 	const onCopyMarkdown = () => {
@@ -130,10 +114,10 @@
 	};
 
 	let gistURL = '';
-	stateStore.subscribe(({ loader }) => {
+	codeStore.subscribe((state) => {
-		if (loader?.type === 'gist') {
+		if (state.loader?.type === 'gist') {
 			// @ts-ignore Gist will have url
-			gistURL = loader.config.url;
+			gistURL = state.loader.config.url;
 		}
 	});
 
@@ -155,11 +139,11 @@
 	if (browser && ['mermaid.live', 'netlify'].some((path) => window.location.host.includes(path))) {
 		isNetlify = true;
 	}
-	stateStore.subscribe(({ code, serialized }) => {
+	serializedState.subscribe((encodedState: string) => {
-		iUrl = `${rendererUrl}/img/${serialized}`;
+		iUrl = `${rendererUrl}/img/${encodedState}`;
-		svgUrl = `${rendererUrl}/svg/${serialized}`;
+		svgUrl = `${rendererUrl}/svg/${encodedState}`;
-		krokiUrl = `${krokiRendererUrl}/mermaid/svg/${pakoSerde.serialize(code)}`;
+		krokiUrl = `${krokiRendererUrl}/mermaid/svg/${pakoSerde.serialize($codeStore.code)}`;
-		mdCode = `[![](${iUrl})](${window.location.protocol}//${window.location.host}${window.location.pathname}#${serialized})`;
+		mdCode = `[![](${iUrl})](${window.location.protocol}//${window.location.host}${window.location.pathname}#${encodedState})`;
 	});
 </script>
 
@@ -170,10 +154,10 @@
 				><i class="far fa-copy mr-2" /> Copy Image to clipboard
 			</button>
 		{/if}
-		<button id="downloadPNG" class="action-btn flex-auto" on:click={onDownloadPNG}>
+		<button class="action-btn flex-auto" on:click={onDownloadPNG}>
 			<i class="fas fa-download mr-2" /> PNG
 		</button>
-		<button id="downloadSVG" class="action-btn flex-auto" on:click={onDownloadSVG}>
+		<button class="action-btn flex-auto" on:click={onDownloadSVG}>
 			<i class="fas fa-download mr-2" /> SVG
 		</button>
 		<a target="_blank" href={iUrl}>

src/lib/components/editor.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { EditorEvents } from '$lib/types';
-	import { stateStore } from '$lib/util/state';
+	import { codeStore } from '$lib/util/state';
 	import { themeStore } from '$lib/util/theme';
 	import type monaco from 'monaco-editor';
 	import { createEventDispatcher, onMount } from 'svelte';
@@ -21,16 +21,17 @@
 		theme: 'mermaid',
 		overviewRulerLanes: 0
 	};
+	export let errorMarkers: monaco.editor.IMarkerData[] = [];
 	let oldText = text;
 	$: editor && Monaco?.editor.setModelLanguage(editor.getModel(), language);
 	$: {
 		if (text !== oldText) {
-			if ($stateStore.updateEditor) {
+			if ($codeStore.updateEditor) {
 				editor?.setValue(text);
 			}
 			oldText = text;
 		}
-		editor && Monaco?.editor.setModelMarkers(editor.getModel(), 'test', $stateStore.errorMarkers);
+		editor && Monaco?.editor.setModelMarkers(editor.getModel(), 'test', errorMarkers);
 	}
 
 	themeStore.subscribe(({ isDark }) => {

src/lib/components/history/history.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import Card from '$lib/components/card/card.svelte';
-	import { inputStateStore, getStateString } from '$lib/util/state';
+	import { codeStore, getStateString } from '$lib/util/state';
 	import {
 		addHistoryEntry,
 		historyModeStore,
@@ -37,7 +37,7 @@
 		const previousState: string = getPreviousState(auto);
 		if (previousState !== currentState) {
 			addHistoryEntry({
-				state: $inputStateStore,
+				state: $codeStore,
 				time: Date.now(),
 				type: auto ? 'auto' : 'manual'
 			});
@@ -54,7 +54,7 @@
 	};
 
 	const restoreHistory = (state: State): void => {
-		inputStateStore.set({ ...state, updateEditor: true, updateDiagram: true });
+		codeStore.set({ ...state, updateEditor: true, updateDiagram: true });
 	};
 
 	const relativeTime = (time: number) => {

src/lib/components/preset.svelte

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

src/lib/components/view.svelte

@@ -1,5 +1,7 @@
 <script lang="ts">
-	import { inputStateStore, stateStore } from '$lib/util/state';
+	import { errorStore } from '$lib/util/error';
+
+	import { codeStore } from '$lib/util/state';
 	import { onMount } from 'svelte';
 	import mermaid from 'mermaid';
 
@@ -11,16 +13,11 @@
 	let outOfSync = false;
 	let manualUpdate = true;
 	onMount(() => {
-		stateStore.subscribe((state) => {
+		codeStore.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;
+						$codeStore.updateDiagram = false;
 					}
 					outOfSync = false;
 					manualUpdate = true;
@@ -34,10 +31,7 @@
 					delete container.dataset.processed;
 					mermaid.initialize(Object.assign({}, JSON.parse(state.mermaid)));
 					mermaid.render('graph-div', code, (svgCode) => {
-						if (svgCode.length > 0) {
+						container.innerHTML = svgCode;
-							console.log(svgCode);
-							container.innerHTML = svgCode;
-						}
 					});
 					view.parentElement.scrollTop = scroll;
 					error = false;
@@ -51,19 +45,24 @@
 				error = true;
 			}
 		});
+		errorStore.subscribe((err) => {
+			if (typeof err === 'undefined') {
+				error = false;
+			} else {
+				error = true;
+				console.log('Error: ', err);
+			}
+		});
 	});
 </script>
 
-{#if error && $stateStore.error instanceof Error}
-	<div class="p-2 text-red-600" id="errorContainer">{$stateStore.error}</div>
-{/if}
-
 <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 {
+		border: 1px solor darkred;
 		flex: 1;
 	}
 	.error,

src/lib/types.d.ts

@@ -6,16 +6,6 @@ export interface Locals {
 	userid: string;
 }
 
-export interface MarkerData {
-	severity: number;
-	message: string;
-	source?: string;
-	startLineNumber: number;
-	startColumn: number;
-	endLineNumber: number;
-	endColumn: number;
-}
-
 export interface EditorUpdateEvent {
 	text: string;
 }
@@ -42,12 +32,6 @@ export interface State {
 	loader?: LoaderConfig;
 }
 
-export interface ValidatedState extends State {
-	error: any;
-	errorMarkers: MarkerData[];
-	serialized: string;
-}
-
 export interface GistLoaderConfig {
 	url: string;
 }
@@ -80,4 +64,4 @@ export interface DocConfig {
 	};
 }
 
-export type Loader = (url: string) => Promise<State>;
+type Loader = (url: string) => Promise<State>;

src/lib/util/error.ts

@@ -0,0 +1,3 @@
+import { writable } from 'svelte/store';
+
+export const errorStore = writable(undefined);

src/lib/util/fileLoaders/loader.ts

@@ -54,4 +54,5 @@ export const loadDataFromUrl = async (): Promise<void> => {
 			updateDiagram: true,
 			updateEditor: true
 		});
+	// window.location.search = '';
 };

src/lib/util/state.ts

@@ -1,11 +1,9 @@
 import { writable, get, derived } from 'svelte/store';
+import type { Readable } from 'svelte/store';
 import { persist, localStorage } from '@macfja/svelte-persistent-store';
+import type { State } from '$lib/types';
 import { saveStatistics } from './stats';
 import { serializeState, deserializeState } from './serde';
-import mermaid from 'mermaid';
-
-import type { Readable } from 'svelte/store';
-import type { MarkerData, State, ValidatedState } from '$lib/types';
 
 export const defaultState: State = {
 	code: `graph TD
@@ -38,42 +36,9 @@ const urlParseFailedState = `graph TD
     G --> |"No :("| H(Try using the Timeline tab in History <br/>from same browser you used to create the diagram.)
     click D href "https://github.com/mermaid-js/mermaid-live-editor/issues/new?assignees=&labels=bug&template=bug_report.md&title=Broken%20link" "Raise issue"`;
 
-// inputStateStore handles all updates and is shared externally when exporting via URL, History, etc.
+export const codeStore = persist(writable(defaultState), localStorage(), 'codeStore');
-export const inputStateStore = persist(writable(defaultState), localStorage(), 'codeStore');
+export const serializedState: Readable<string> = derived([codeStore], ([code], set) => {
-
+	set(serializeState(code));
-// All internal reads should be done via stateStore, but it should not be persisted/shared externally.
-export const stateStore: Readable<ValidatedState> = derived([inputStateStore], ([state]) => {
-	const processed: ValidatedState = {
-		...state,
-		serialized: '',
-		errorMarkers: [],
-		error: undefined
-	};
-	// 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 => {
@@ -92,33 +57,30 @@ export const loadState = (data: string): void => {
 		) {
 			delete mermaidConfig.securityLevel; // Prevent setting overriding securityLevel when loading state to mitigate possible XSS attack
 		}
+
 		state.mermaid = JSON.stringify(mermaidConfig, null, 2);
 	} catch (e) {
-		state = get(inputStateStore);
+		state = get(codeStore);
 		if (data) {
 			console.error('Init error', e);
 			state.code = urlParseFailedState;
-			state.mermaid = defaultState.mermaid;
 		}
 	}
 	updateCodeStore({ ...state, updateEditor: true });
 };
 
 export const updateCodeStore = (newState: State): void => {
-	inputStateStore.update((state) => {
+	codeStore.update((state) => {
 		return { ...state, ...newState };
 	});
 };
 
 let prompted = false;
-export const updateCode = (
+export const updateCode = (code: string, updateEditor: boolean, updateDiagram = false): void => {
-	code: string,
-	{ 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) {
+	if (lines > 50 && !prompted && get(codeStore).autoSync) {
 		const turnOff = confirm(
 			'Long diagram detected. Turn off Auto Sync? Click the sync logo to manually sync.'
 		);
@@ -130,19 +92,19 @@ export const updateCode = (
 		}
 	}
 
-	inputStateStore.update((state) => {
+	codeStore.update((state) => {
 		return { ...state, code, updateEditor, updateDiagram };
 	});
 };
 
 export const updateConfig = (config: string, updateEditor: boolean): void => {
-	inputStateStore.update((state) => {
+	codeStore.update((state) => {
 		return { ...state, mermaid: config, updateEditor };
 	});
 };
 
 export const toggleDarkTheme = (dark: boolean): void => {
-	inputStateStore.update((state) => {
+	codeStore.update((state) => {
 		const config = JSON.parse(state.mermaid);
 		if (!config.theme || ['dark', 'default'].includes(config.theme)) {
 			config.theme = dark ? 'dark' : 'default';
@@ -153,11 +115,11 @@ export const toggleDarkTheme = (dark: boolean): void => {
 };
 
 export const initURLSubscription = (): void => {
-	stateStore.subscribe(({ serialized }) => {
+	serializedState.subscribe((state: string) => {
-		history.replaceState(undefined, undefined, `#${serialized}`);
+		history.replaceState(undefined, undefined, `#${state}`);
 	});
 };
 
 export const getStateString = (): string => {
-	return JSON.stringify(get(inputStateStore));
+	return JSON.stringify(get(codeStore));
 };

src/routes/edit.svelte

@@ -6,12 +6,17 @@
 	import View from '$lib/components/view.svelte';
 	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 { updateCode, updateConfig, codeStore, serializedState } from '$lib/util/state';
 	import { initHandler, syncDiagram } from '$lib/util/util';
+	import { errorStore } from '$lib/util/error';
 	import { onMount } from 'svelte';
+	import mermaid from 'mermaid';
+	import type monaco from 'monaco-editor';
 	import type { EditorUpdateEvent, State, Tab, DocConfig } from '$lib/types';
 	import { base } from '$app/paths';
 
+	serializedState; // Weird fix for error > serializedState is not defined. Treeshaking?
+
 	type Modes = 'code' | 'config';
 	type Languages = 'mermaid' | 'json';
 
@@ -63,16 +68,17 @@
 	let text = '';
 	let docURL = docURLBase;
 	let language: Languages = 'mermaid';
+	let errorMarkers: monaco.editor.IMarkerData[] = [];
 	$: language = languageMap[selectedMode];
 	$: {
 		if (selectedMode === 'code') {
-			text = $stateStore.code;
+			text = $codeStore.code;
 		} else {
-			text = $stateStore.mermaid;
+			text = $codeStore.mermaid;
 		}
 	}
 
-	stateStore.subscribe((state: State) => {
+	codeStore.subscribe((state: State) => {
 		if (state.updateEditor) {
 			text = selectedMode === 'code' ? state.code : state.mermaid;
 		}
@@ -85,7 +91,7 @@
 	});
 	const tabSelectHandler = (message: CustomEvent<Tab>) => {
 		selectedMode = message.detail.id === 'code' ? 'code' : 'config';
-		$inputStateStore.updateEditor = true;
+		$codeStore.updateEditor = true;
 	};
 	const tabs: Tab[] = [
 		{
@@ -100,26 +106,55 @@
 		}
 	];
 
+	const handleCodeUpdate = (code: string): void => {
+		mermaid.parse(code);
+		updateCode(code, false);
+	};
+
+	const handleConfigUpdate = (config: string): void => {
+		JSON.parse(config);
+		updateConfig(config, false);
+	};
+
 	const updateHandler = (message: CustomEvent<EditorUpdateEvent>) => {
-		const code = message.detail.text;
+		try {
-		if (selectedMode === 'code') {
+			if (selectedMode === 'code') {
-			updateCode(code, {
+				handleCodeUpdate(message.detail.text);
-				updateEditor: false
+			} else {
-			});
+				handleConfigUpdate(message.detail.text);
-		} else {
+			}
-			updateConfig(code, false);
+			errorStore.set(undefined);
+			errorMarkers = [];
+		} catch (e) {
+			errorStore.set(e);
+			if (e.hash) {
+				const marker: monaco.editor.IMarkerData = {
+					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
+				};
+				errorMarkers.push(marker);
+				// Clear all previous errors before this error.
+				errorMarkers = errorMarkers.filter(
+					(m) => m.startLineNumber >= marker.startLineNumber && m.startColumn >= marker.startColumn
+				);
+			}
+			console.error(e);
 		}
 	};
 
 	const viewDiagram = () => {
-		window.open(`${base}/view#${$stateStore.serialized}`, '_blank').focus();
+		window.open(`${base}/view#${$serializedState}`, '_blank').focus();
 	};
 
 	onMount(async () => {
 		await initHandler();
 		const resizer = document.getElementById('resizeHandler');
 		const element = document.getElementById('editorPane');
-		const resize = (e: { pageX: number }) => {
+		const resize = (e) => {
 			const newWidth = e.pageX - element.getBoundingClientRect().left;
 			if (newWidth > 50) {
 				element.style.width = `${newWidth}px`;
@@ -149,13 +184,13 @@
 								<span> Auto sync</span>
 								<input
 									type="checkbox"
-									class="toggle {$stateStore.autoSync ? 'btn-secondary' : 'toggle-primary'} ml-1"
+									class="toggle {$codeStore.autoSync ? 'btn-secondary' : 'toggle-primary'} ml-1"
 									id="autoSync"
-									bind:checked={$inputStateStore.autoSync} />
+									bind:checked={$codeStore.autoSync} />
 							</label>
 						</div>
 
-						{#if !$stateStore.autoSync}
+						{#if !$codeStore.autoSync}
 							<button
 								class="btn btn-secondary btn-xs mr-1"
 								title="Sync Diagram"
@@ -169,7 +204,7 @@
 					</div>
 				</div>
 
-				<Editor on:update={updateHandler} {language} bind:text />
+				<Editor on:update={updateHandler} {language} bind:text {errorMarkers} />
 			</Card>
 
 			<div class="-mt-2">

tsconfig.json

@@ -7,8 +7,5 @@
 		"cypress/**/*.js",
 		"static/**/*.js"
 	],
-	"compilerOptions": {
-		"allowSyntheticDefaultImports": true
-	},
 	"extends": "./.svelte-kit/tsconfig.json"
 }

yarn.lock

@@ -208,20 +208,20 @@
   dependencies:
     tiny-glob "^0.2.9"
 
-"@sveltejs/kit@1.0.0-next.354":
+"@sveltejs/kit@1.0.0-next.350":
-  version "1.0.0-next.354"
+  version "1.0.0-next.350"
-  resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.0.0-next.354.tgz#e1786892b6fec93e78d270497231081174dffc55"
+  resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.0.0-next.350.tgz#b90fc2f337b518837664b47c0fe77a978d00c1ce"
-  integrity sha512-dTfFT0c3sxztFpiw6H4bQnPd+PtHgEZG6j6ssT9sWLONfzUgWRX0S7H/WoPEjr7u65o2HNazoj8jmEq3ZTwb9g==
+  integrity sha512-qkZNjp7yIj6t91+wMhmMtGJH0Lb89OaKdVXUDy92CS5/4OHRTKcQPdfOKs4no/upkS3RiFb+rEpOkYqTMcPUXg==
   dependencies:
-    "@sveltejs/vite-plugin-svelte" "^1.0.0-next.48"
+    "@sveltejs/vite-plugin-svelte" "^1.0.0-next.46"
     chokidar "^3.5.3"
     sade "^1.8.1"
     vite "^2.9.10"
 
-"@sveltejs/vite-plugin-svelte@^1.0.0-next.48":
+"@sveltejs/vite-plugin-svelte@^1.0.0-next.46":
-  version "1.0.0-next.49"
+  version "1.0.0-next.48"
-  resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-1.0.0-next.49.tgz#44cc00a19c6c23002516b66c5ab90ee66720df57"
+  resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-1.0.0-next.48.tgz#6ab566d56c842d45a988cf73c119d0038d4ce893"
-  integrity sha512-AKh0Ka8EDgidnxWUs8Hh2iZLZovkETkefO99XxZ4sW4WGJ7VFeBx5kH/NIIGlaNHLcrIvK3CK0HkZwC3Cici0A==
+  integrity sha512-hjCEww6FKSuHVMe56vZLClUDuRqK4A/ZC5hPUIx/o2fQ7HmRydp4ztEopjMMnl/YYyEceGBKgY781I9PGEYvAw==
   dependencies:
     "@rollup/pluginutils" "^4.2.1"
     debug "^4.3.4"
@@ -516,10 +516,10 @@ arch@^2.2.0:
   resolved "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz"
   integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
 
-arg@^5.0.2:
+arg@^5.0.1:
-  version "5.0.2"
+  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb"
-  integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==
+  integrity sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA==
 
 argparse@^1.0.7:
   version "1.0.10"
@@ -728,9 +728,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001332, caniuse-lite@^1.0.30001335:
-  version "1.0.30001359"
+  version "1.0.30001354"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001359.tgz"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001354.tgz"
-  integrity sha512-Xln/BAsPzEuiVLgJ2/45IaqD9jShtk3Y33anKb4+yLwQzws3+v6odKfpgES/cDEaZMLzSChpIGdbOYtH9MyuHw==
+  integrity sha512-mImKeCkyGDAHNywYFA4bqnLAzTUvVkqPvhY4DV47X+Gl2c5Z8c3KNETnXp14GQt11LvxE8AwjzGxJ+rsikiOzg==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -968,10 +968,10 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-css-declaration-sorter@^6.3.0:
+css-declaration-sorter@^6.2.2:
-  version "6.3.0"
+  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz#72ebd995c8f4532ff0036631f7365cce9759df14"
+  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz#bfd2f6f50002d6a3ae779a87d3a0c5d5b10e0f02"
-  integrity sha512-OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og==
+  integrity sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==
 
 css-select@^4.1.3, css-select@^4.2.1:
   version "4.2.1"
@@ -1010,12 +1010,12 @@ cssesc@^3.0.0:
   resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssnano-preset-default@^5.2.12:
+cssnano-preset-default@^5.2.11:
-  version "5.2.12"
+  version "5.2.11"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.12.tgz#ebe6596ec7030e62c3eb2b3c09f533c0644a9a97"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.11.tgz#28350471bc1af9df14052472b61340347f453a53"
-  integrity sha512-OyCBTZi+PXgylz9HAA5kHyoYhfGcYdwFmyaJzWnzxuGRtnMw/kR6ilW9XzlzlRAtB6PLT/r+prYgkef7hngFew==
+  integrity sha512-4PadR1NtuaIK8MvLNuY7MznK4WJteldGlzCiMaaTiOUP+apeiIvUDIXykzUOoqgOOUAHrU64ncdD90NfZR3LSQ==
   dependencies:
-    css-declaration-sorter "^6.3.0"
+    css-declaration-sorter "^6.2.2"
     cssnano-utils "^3.1.0"
     postcss-calc "^8.2.3"
     postcss-colormin "^5.3.0"
@@ -1024,7 +1024,7 @@ cssnano-preset-default@^5.2.12:
     postcss-discard-duplicates "^5.1.0"
     postcss-discard-empty "^5.1.1"
     postcss-discard-overridden "^5.1.0"
-    postcss-merge-longhand "^5.1.6"
+    postcss-merge-longhand "^5.1.5"
     postcss-merge-rules "^5.1.2"
     postcss-minify-font-values "^5.1.0"
     postcss-minify-gradients "^5.1.1"
@@ -1032,14 +1032,14 @@ cssnano-preset-default@^5.2.12:
     postcss-minify-selectors "^5.2.1"
     postcss-normalize-charset "^5.1.0"
     postcss-normalize-display-values "^5.1.0"
-    postcss-normalize-positions "^5.1.1"
+    postcss-normalize-positions "^5.1.0"
-    postcss-normalize-repeat-style "^5.1.1"
+    postcss-normalize-repeat-style "^5.1.0"
     postcss-normalize-string "^5.1.0"
     postcss-normalize-timing-functions "^5.1.0"
     postcss-normalize-unicode "^5.1.0"
     postcss-normalize-url "^5.1.0"
     postcss-normalize-whitespace "^5.1.1"
-    postcss-ordered-values "^5.1.3"
+    postcss-ordered-values "^5.1.2"
     postcss-reduce-initial "^5.1.0"
     postcss-reduce-transforms "^5.1.0"
     postcss-svgo "^5.1.0"
@@ -1050,12 +1050,12 @@ cssnano-utils@^3.1.0:
   resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861"
   integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==
 
-cssnano@^5.1.12:
+cssnano@^5.1.11:
-  version "5.1.12"
+  version "5.1.11"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.12.tgz#bcd0b64d6be8692de79332c501daa7ece969816c"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.11.tgz#3bb003380718c7948ce3813493370e8946caf04b"
-  integrity sha512-TgvArbEZu0lk/dvg2ja+B7kYoD7BBCmn3+k58xD0qjrGHsFzXY/wKTo9M5egcUCabPol05e/PVoIu79s2JN4WQ==
+  integrity sha512-2nx+O6LvewPo5EBtYrKc8762mMkZRk9cMGIOP4UlkmxHm7ObxH+zvsJJ+qLwPkUc4/yumL/qJkavYi9NlodWIQ==
   dependencies:
-    cssnano-preset-default "^5.2.12"
+    cssnano-preset-default "^5.2.11"
     lilconfig "^2.0.3"
     yaml "^1.10.2"
 
@@ -1066,20 +1066,15 @@ csso@^4.2.0:
   dependencies:
     css-tree "^1.1.2"
 
-cy-verify-downloads@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/cy-verify-downloads/-/cy-verify-downloads-0.1.8.tgz#e16e86f1a6cc17376c39b4c5aa53e5ffa630c9c0"
-  integrity sha512-hfcgXd/YAtoN6TRmuy26DetcxBkApMJPBJI/T61KrV4PciOaWZtFhxPaiF7Kn2aE8XzXt1Os3HULM2Yp8A1mfw==
-
 cypress-localstorage-commands@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cypress-localstorage-commands/-/cypress-localstorage-commands-2.1.0.tgz#6fc299ec60b6b5ccfc09dd23d004866b7444ee78"
   integrity sha512-DIJLCIh+CcKulAxMVEng6EhpW691emHRqFUD4dK2HUn86Xzt3ABL3SkmxW4rXgvQt697nTDpZC+jo5K5BwndrQ==
 
-cypress@10.2.0:
+cypress@10.0.3:
-  version "10.2.0"
+  version "10.0.3"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.2.0.tgz#ca078abfceb13be2a33cbba6e0e80ded770f542a"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.0.3.tgz#889b4bef863b7d1ef1b608b85b964394ad350c5f"
-  integrity sha512-+i9lY5ENlfi2mJwsggzR+XASOIgMd7S/Gd3/13NCpv596n3YSplMAueBTIxNLcxDpTcIksp+9pM3UaDrJDpFqA==
+  integrity sha512-8C82XTybsEmJC9POYSNITGUhMLCRwB9LadP0x33H+52QVoBjhsWvIzrI+ybCe0+TyxaF0D5/9IL2kSTgjqCB9A==
   dependencies:
     "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
@@ -1634,10 +1629,10 @@ dagre@^0.8.5:
     graphlib "^2.1.8"
     lodash "^4.17.15"
 
-daisyui@2.17.0:
+daisyui@2.15.2:
-  version "2.17.0"
+  version "2.15.2"
-  resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-2.17.0.tgz#4a1016cf5e0d32ee4dec1139f600b06bfd185ceb"
+  resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-2.15.2.tgz#4182942fde62d605ba95526a325e08bead70dbe9"
-  integrity sha512-U8eA8IvwH0JSi72WbRZdmJcYZek3ERMPFPAVFhnYc6dGnobeIHLGBz8J4q012I9YVDUqXFrWz13rpn+SBdn7qQ==
+  integrity sha512-12hjzlOUkGVzMPKhaBc8soqNY2mJWGTYJF8sTuCibDcdGbHDmYgBUY0OX1HHIVq/qh2vELh5yHb4QCgCDWUAwg==
   dependencies:
     color "^4.2"
     css-selector-tokenizer "^0.8.0"
@@ -2956,10 +2951,10 @@ lilconfig@2.0.5, lilconfig@^2.0.3, lilconfig@^2.0.5:
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.5.tgz#19e57fd06ccc3848fd1891655b5a447092225b25"
   integrity sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==
 
-lint-staged@13.0.2:
+lint-staged@13.0.1:
-  version "13.0.2"
+  version "13.0.1"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-13.0.2.tgz#35a1c57130e9ad5b1dea784972a40777ba433dd5"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-13.0.1.tgz#899e78065ab29b88fdd922482411121664ef66be"
-  integrity sha512-qQLfLTh9z34eMzfEHENC+QBskZfxjomrf+snF3xJ4BzilORbD989NLqQ00ughsF/A+PT41e87+WsMFabf9++pQ==
+  integrity sha512-Ykaf4QTi0a02BF7cnq7JIPGOJxH4TkNMWhSlJdH9wOekd0X+gog47Jfh/0L31DqZe5AiydLGC7LkPqpaNm+Kvg==
   dependencies:
     cli-truncate "^3.1.0"
     colorette "^2.0.17"
@@ -3233,10 +3228,10 @@ monaco-editor@^0.33.0:
   resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.33.0.tgz#842e244f3750a2482f8a29c676b5684e75ff34af"
   integrity sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw==
 
-monaco-mermaid@^1.0.6:
+monaco-mermaid@^1.0.4:
-  version "1.0.6"
+  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/monaco-mermaid/-/monaco-mermaid-1.0.6.tgz#2f0db5b38cb0c6539a28d5e5758dc24f88d931f3"
+  resolved "https://registry.yarnpkg.com/monaco-mermaid/-/monaco-mermaid-1.0.4.tgz#05033668c654b693b9c104f29bd2384b0ac349a0"
-  integrity sha512-ntPXb1DPQ9k4/3pV3GLXF39KZOXrpns9nfB5On77nFATuUwN81N/clOR9SvGnoQhcP7n8A0ppE8JVNeYfVF97g==
+  integrity sha512-Mpr+7D4QzEmlSfQYxhMNhf1ZtjN/PUTbMJPs+XdTKnfC2/YzQTtPLEk4mTxbDCeH8N4EzL7jOmF/3DIk8c7Dkw==
 
 mri@^1.1.0:
   version "1.1.6"
@@ -3592,10 +3587,10 @@ postcss-load-config@^4.0.1:
     lilconfig "^2.0.5"
     yaml "^2.1.1"
 
-postcss-merge-longhand@^5.1.6:
+postcss-merge-longhand@^5.1.5:
-  version "5.1.6"
+  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.6.tgz#f378a8a7e55766b7b644f48e5d8c789ed7ed51ce"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.5.tgz#b0e03bee3b964336f5f33c4fc8eacae608e91c05"
-  integrity sha512-6C/UGF/3T5OE2CEbOuX7iNO63dnvqhGZeUnKkDeifebY0XqkkvrctYSZurpNE902LDf2yKwwPFgotnfSoPhQiw==
+  integrity sha512-NOG1grw9wIO+60arKa2YYsrbgvP6tp+jqc7+ZD5/MalIw234ooH2C6KlR6FEn4yle7GqZoBxSK1mLBE9KPur6w==
   dependencies:
     postcss-value-parser "^4.2.0"
     stylehacks "^5.1.0"
@@ -3689,17 +3684,17 @@ postcss-normalize-display-values@^5.1.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-positions@^5.1.1:
+postcss-normalize-positions@^5.1.0:
-  version "5.1.1"
+  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz#ef97279d894087b59325b45c47f1e863daefbb92"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz#902a7cb97cf0b9e8b1b654d4a43d451e48966458"
-  integrity sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==
+  integrity sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-repeat-style@^5.1.1:
+postcss-normalize-repeat-style@^5.1.0:
-  version "5.1.1"
+  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz#e9eb96805204f4766df66fd09ed2e13545420fb2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz#f6d6fd5a54f51a741cc84a37f7459e60ef7a6398"
-  integrity sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==
+  integrity sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -3740,10 +3735,10 @@ postcss-normalize-whitespace@^5.1.1:
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-ordered-values@^5.1.3:
+postcss-ordered-values@^5.1.2:
-  version "5.1.3"
+  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz#b6fd2bd10f937b23d86bc829c69e7732ce76ea38"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.2.tgz#daffacd4abf327d52d5ac570b59dfbcf4b836614"
-  integrity sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==
+  integrity sha512-wr2avRbW4HS2XE2ZCqpfp4N/tDC6GZKZ+SVP8UBTOVS8QWrc4TD8MYrebJrvVVlGPKszmiSCzue43NDiVtgDmg==
   dependencies:
     cssnano-utils "^3.1.0"
     postcss-value-parser "^4.2.0"
@@ -3810,10 +3805,10 @@ prettier-plugin-svelte@^2.7.0:
   resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-2.7.0.tgz#ecfa4fe824238a4466a3497df1a96d15cf43cabb"
   integrity sha512-fQhhZICprZot2IqEyoiUYLTRdumULGRvw0o4dzl5jt0jfzVWdGqeYW27QTWAeXhoupEZJULmNoH3ueJwUWFLIA==
 
-prettier@~2.7.1:
+prettier@~2.6.2:
-  version "2.7.1"
+  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032"
-  integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
+  integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
 
 pretty-bytes@^5.6.0:
   version "5.6.0"
@@ -4395,12 +4390,12 @@ table@^6.0.9:
     string-width "^4.2.0"
     strip-ansi "^6.0.0"
 
-tailwindcss@^3.0, tailwindcss@^3.0.7, tailwindcss@^3.1.4:
+tailwindcss@^3.0, tailwindcss@^3.0.7, tailwindcss@^3.1.1:
-  version "3.1.4"
+  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.1.4.tgz#64b09059805505902139fa805d97046080bd90b9"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.1.1.tgz#58102595ddd5406c5015d831a344370be0995cda"
-  integrity sha512-NrxbFV4tYsga/hpWbRyUfIaBrNMXDxx5BsHgBS4v5tlyjf+sDsgBg5m9OxjrXIqAS/uR9kicxLKP+bEHI7BSeQ==
+  integrity sha512-F5VFj5FiS4QZqdXPE6T6RJFqbsmISQ2KBUp9bOQyws9TleGToHsa54X8kwXwVdHMQhNeXOlxI47lrRICEVuOvg==
   dependencies:
-    arg "^5.0.2"
+    arg "^5.0.1"
     chokidar "^3.5.3"
     color-name "^1.1.4"
     detective "^5.2.1"