Update deploy.yml

Bumps [cypress-localstorage-commands](https://github.com/javierbrea/cypress-localstorage-commands) from 1.6.1 to 1.7.0.
- [Release notes](https://github.com/javierbrea/cypress-localstorage-commands/releases)
- [Changelog](https://github.com/javierbrea/cypress-localstorage-commands/blob/master/CHANGELOG.md)
- [Commits](https://github.com/javierbrea/cypress-localstorage-commands/compare/v1.6.1...v1.7.0)

---
updated-dependencies:
- dependency-name: cypress-localstorage-commands
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.eslintrc.cjs

@@ -4,7 +4,7 @@ module.exports = {
 	extends: [
 		'eslint:recommended',
 		'plugin:@typescript-eslint/recommended',
-		'plugin:@typescript-eslint/recommended-requiring-type-checking',
+		// 'plugin:@typescript-eslint/recommended-requiring-type-checking',
 		'prettier'
 	],
 	plugins: ['svelte3', 'tailwindcss', '@typescript-eslint', 'es'],

.github/workflows/deploy.yml

@@ -11,24 +11,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache
+      - uses: actions/setup-node@v3
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          node-version: '16'
+          cache: yarn
 
       - name: Build & Deploy
         run: |

.github/workflows/update-browserlist.yml

@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v2
       - run: npx browserslist@latest --update-db
       - name: Commit changes
-        uses: EndBug/add-and-commit@v7
+        uses: EndBug/add-and-commit@v8
         with:
           author_name: ${{ github.actor }}
           author_email: ${{ github.actor }}@users.noreply.github.com

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

@@ -1,8 +1,7 @@
 name: Update Monaco-editor
 on:
   workflow_dispatch:
-  pull_request:
-    types: [opened]
+  push:
     branches:
       - 'dependabot/npm_and_yarn/develop/monaco-editor-**'
 
@@ -13,7 +12,7 @@ jobs:
       - uses: actions/checkout@v2
       - run: ./bin/update-monaco
       - name: Commit changes
-        uses: EndBug/add-and-commit@v7
+        uses: EndBug/add-and-commit@v8
         with:
           author_name: ${{ github.actor }}
           author_email: ${{ github.actor }}@users.noreply.github.com

Dockerfile

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

cypress/integration/diagramUpdate.spec.ts

@@ -30,4 +30,14 @@ describe('Auto sync tests', () => {
 		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}}/`);
+		cy.get('#view').contains('Car').should('not.exist');
+
+		cy.get('#editor').type(`{uparrow}{${cmd}}/`);
+		cy.get('#view').contains('Car').should('exist');
+	});
 });

cypress/integration/history.spec.ts

@@ -46,7 +46,9 @@ describe('Save History', () => {
 		cy.get('#historyList').contains('No items in History');
 	});
 
-	it('should auto 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);
 		cy.contains('Timeline').click();

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": "9.2.0",
+  "__version": "9.3.1",
   "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

@@ -15,49 +15,50 @@
 	},
 	"devDependencies": {
 		"@cypress/snapshot": "^2.1.7",
-		"@sveltejs/adapter-static": "1.0.0-next.26",
-		"@sveltejs/kit": "1.0.0-next.232",
+		"@sveltejs/adapter-static": "1.0.0-next.28",
+		"@sveltejs/kit": "1.0.0-next.278",
 		"@types/mermaid": "^8.2.7",
 		"@types/pako": "^1.0.3",
 		"@typescript-eslint/eslint-plugin": "^4.33.0",
 		"@typescript-eslint/parser": "^4.33.0",
 		"autoprefixer": "^10.4.2",
-		"chai": "^4.3.4",
-		"cssnano": "^5.0.15",
-		"cypress": "9.3.1",
-		"cypress-localstorage-commands": "^1.6.1",
+		"chai": "^4.3.6",
+		"cssnano": "^5.0.17",
+		"cypress": "9.5.0",
+		"cypress-localstorage-commands": "^1.7.0",
 		"eslint": "^7.32.0",
-		"eslint-config-prettier": "^8.1.0",
+		"eslint-config-prettier": "^8.4.0",
 		"eslint-plugin-cypress": "^2.12.1",
 		"eslint-plugin-es": "^4.1.0",
 		"eslint-plugin-mocha": "^10.0.3",
 		"eslint-plugin-postcss-modules": "^2.0.0",
-		"eslint-plugin-svelte3": "^3.4.0",
-		"eslint-plugin-tailwindcss": "^3.3.0",
+		"eslint-plugin-svelte3": "^3.4.1",
+		"eslint-plugin-tailwindcss": "^3.5.0",
 		"husky": "^7.0.4",
-		"lint-staged": "^12.2.1",
-		"mocha": "^9.1.4",
+		"lint-staged": "^12.3.4",
+		"mocha": "^9.2.1",
 		"node-html-parser": "^5.2.0",
-		"postcss": "^8.4.5",
-		"postcss-load-config": "^3.1.1",
+		"postcss": "^8.4.7",
+		"postcss-load-config": "^3.1.3",
 		"prettier": "~2.5.1",
 		"prettier-plugin-svelte": "^2.6.0",
-		"svelte": "^3.46.2",
-		"svelte-preprocess": "^4.10.2",
-		"tailwindcss": "^3.0.13",
+		"svelte": "^3.46.4",
+		"svelte-preprocess": "^4.10.4",
+		"tailwindcss": "^3.0.21",
 		"tslib": "^2.3.1",
-		"typescript": "^4.5.4"
+		"typescript": "^4.5.5"
 	},
 	"type": "module",
 	"dependencies": {
 		"@analytics/google-analytics": "^0.5.3",
 		"@macfja/svelte-persistent-store": "^1.2.0",
-		"analytics": "^0.7.21",
-		"daisyui": "1.24.3",
+		"analytics": "^0.8.0",
+		"daisyui": "2.2.2",
 		"js-base64": "^3.7.2",
-		"mermaid": "8.13.9",
+		"mermaid": "8.14.0",
 		"moment": "^2.29.1",
-		"monaco-editor": "^0.31.1",
+		"monaco-editor": "^0.32.1",
+		"monaco-mermaid": "^1.0.3",
 		"pako": "2.0.4",
 		"random-word-slugs": "^0.1.6"
 	},

src/app.html

@@ -18,24 +18,24 @@
 			href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css" />
 		<link
 			rel="stylesheet"
-			href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.31.1/min/vs/editor/editor.main.min.css"
+			href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.1/min/vs/editor/editor.main.min.css"
 			crossorigin="anonymous"
 			referrerpolicy="no-referrer" />
 		<script>
 			var require = {
-				paths: { vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.31.1/min/vs' }
+				paths: { vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.1/min/vs' }
 			};
 		</script>
 		<script
-			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.31.1/min/vs/loader.min.js"
+			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.1/min/vs/loader.min.js"
 			crossorigin="anonymous"
 			referrerpolicy="no-referrer"></script>
 		<script
-			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.31.1/min/vs/editor/editor.main.nls.min.js"
+			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.1/min/vs/editor/editor.main.nls.min.js"
 			crossorigin="anonymous"
 			referrerpolicy="no-referrer"></script>
 		<script
-			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.31.1/min/vs/editor/editor.main.js"
+			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.1/min/vs/editor/editor.main.js"
 			crossorigin="anonymous"
 			referrerpolicy="no-referrer"></script>
 

src/hooks.ts

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

src/lib/components/editor.svelte

@@ -4,7 +4,7 @@
 	import { themeStore } from '$lib/util/theme';
 	import type monaco from 'monaco-editor';
 	import { createEventDispatcher, onMount } from 'svelte';
-	import { initEditor } from './util';
+	import initEditor from 'monaco-mermaid';
 
 	let divEl: HTMLDivElement = null;
 	let editor: monaco.editor.IStandaloneCodeEditor;

src/lib/components/editor/util.ts

@@ -1,552 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export const initEditor = (monacoEditor): void => {
-	monacoEditor.languages.register({ id: 'mermaid' });
-
-	const requirementDiagrams = [
-		'requirement',
-		'functionalRequirement',
-		'interfaceRequirement',
-		'performanceRequirement',
-		'physicalRequirement',
-		'designConstraint'
-	];
-
-	const keywords: {
-		[key: string]: {
-			typeKeywords: string[];
-			blockKeywords: string[];
-			keywords: string[];
-		};
-	} = {
-		flowchart: {
-			typeKeywords: ['flowchart', 'flowchart-v2', 'graph'],
-			blockKeywords: ['subgraph', 'end'],
-			keywords: [
-				'TB',
-				'TD',
-				'BT',
-				'RL',
-				'LR',
-				'click',
-				'call',
-				'href',
-				'_self',
-				'_blank',
-				'_parent',
-				'_top',
-				'linkStyle',
-				'style',
-				'classDef',
-				'class',
-				'direction',
-				'interpolate'
-			]
-		},
-		sequenceDiagram: {
-			typeKeywords: ['sequenceDiagram'],
-			blockKeywords: ['alt', 'par', 'and', 'loop', 'else', 'end', 'rect', 'opt', 'alt', 'rect'],
-			keywords: [
-				'participant',
-				'as',
-				'Note',
-				'note',
-				'right of',
-				'left of',
-				'over',
-				'activate',
-				'deactivate',
-				'autonumber',
-				'title',
-				'actor'
-			]
-		},
-		classDiagram: {
-			typeKeywords: ['classDiagram', 'classDiagram-v2'],
-			blockKeywords: ['class'],
-			keywords: [
-				'link',
-				'click',
-				'callback',
-				'call',
-				'href',
-				'cssClass',
-				'direction',
-				'TB',
-				'BT',
-				'RL',
-				'LR'
-			]
-		},
-		stateDiagram: {
-			typeKeywords: ['stateDiagram', 'stateDiagram-v2'],
-			blockKeywords: ['state', 'note', 'end'],
-			keywords: ['state', 'as', 'hide empty description', 'direction', 'TB', 'BT', 'RL', 'LR']
-		},
-		erDiagram: {
-			typeKeywords: ['erDiagram'],
-			blockKeywords: [],
-			keywords: []
-		},
-		journey: {
-			typeKeywords: ['journey'],
-			blockKeywords: ['section'],
-			keywords: ['title']
-		},
-		info: {
-			typeKeywords: ['info'],
-			blockKeywords: [],
-			keywords: ['showInfo']
-		},
-		gantt: {
-			typeKeywords: ['gantt'],
-			blockKeywords: [],
-			keywords: [
-				'title',
-				'dateFormat',
-				'axisFormat',
-				'todayMarker',
-				'section',
-				'excludes',
-				'inclusiveEndDates'
-			]
-		},
-		requirementDiagram: {
-			typeKeywords: ['requirement', 'requirementDiagram'],
-			blockKeywords: requirementDiagrams.concat('element'),
-			keywords: []
-		},
-		gitGraph: {
-			typeKeywords: ['gitGraph'],
-			blockKeywords: [],
-			keywords: ['commit', 'branch', 'merge', 'reset', 'checkout', 'LR', 'BT']
-		},
-		pie: {
-			typeKeywords: ['pie'],
-			blockKeywords: [],
-			keywords: ['title', 'showData']
-		}
-	};
-
-	// Register a tokens provider for the mermaid language
-	monacoEditor.languages.setMonarchTokensProvider('mermaid', {
-		...Object.entries(keywords)
-			.map((entry) =>
-				Object.fromEntries(
-					Object.entries(entry[1]).map((deepEntry) => [
-						entry[0] + deepEntry[0][0].toUpperCase() + deepEntry[0].slice(1),
-						deepEntry[1]
-					])
-				)
-			)
-			.reduce((overallKeywords, nextKeyword) => ({ ...overallKeywords, ...nextKeyword }), {}),
-		tokenizer: {
-			root: [
-				[/%%(?=.*%%$)/, { token: 'string', nextEmbedded: 'json' }],
-				[/%%$/, { token: 'string', nextEmbedded: '@pop' }],
-				[/^\s*gitGraph/m, 'typeKeyword', 'gitGraph'],
-				[/^\s*info/m, 'typeKeyword', 'info'],
-				[/^\s*pie/m, 'typeKeyword', 'pie'],
-				[/^\s*(flowchart|flowchart-v2|graph)/m, 'typeKeyword', 'flowchart'],
-				[/^\s*sequenceDiagram/, 'typeKeyword', 'sequenceDiagram'],
-				[/^\s*classDiagram(-v2)?/, 'typeKeyword', 'classDiagram'],
-				[/^\s*journey/, 'typeKeyword', 'journey'],
-				[/^\s*gantt/, 'typeKeyword', 'gantt'],
-				[/^\s*stateDiagram(-v2)?/, 'typeKeyword', 'stateDiagram'],
-				[/^\s*erDiagram/, 'typeKeyword', 'erDiagram'],
-				[/^\s*requirement(Diagram)?/, 'typeKeyword', 'requirementDiagram'],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
-			],
-			gitGraph: [
-				[/option(?=s)/, { token: 'typeKeyword', next: 'optionsGitGraph' }],
-				[/(^\s*branch|reset|merge|checkout)(.*$)/, ['keyword', 'variable']],
-				[
-					/[a-zA-Z][\w$]*/,
-					{
-						cases: {
-							'@gitGraphBlockKeywords': 'typeKeyword',
-							'@gitGraphKeywords': 'keyword'
-						}
-					}
-				],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
-				[/".*?"/, 'string'],
-				[/\^/, 'delimiter.bracket']
-			],
-			optionsGitGraph: [
-				[/s$/, { token: 'typeKeyword', nextEmbedded: 'json', matchOnlyAtLineStart: false }],
-				['end', { token: 'typeKeyword', next: '@pop', nextEmbedded: '@pop' }]
-			],
-			info: [
-				[
-					/[a-zA-Z][\w$]*/,
-					{
-						cases: {
-							'@infoBlockKeywords': 'typeKeyword',
-							'@infoKeywords': 'keyword'
-						}
-					}
-				]
-			],
-			pie: [
-				[/(title)(.*$)/, ['keyword', 'string']],
-				[
-					/[a-zA-Z][\w$]*/,
-					{
-						cases: {
-							'@pieBlockKeywords': 'typeKeyword',
-							'@pieKeywords': 'keyword'
-						}
-					}
-				],
-				[/".*?"/, 'string'],
-				[/\s*\d+/, 'number'],
-				[/:/, 'delimiter.bracket'],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
-			],
-			flowchart: [
-				[/[ox]?(--+|==+)[ox]/, 'transition'],
-				[
-					/[a-zA-Z][\w$]*/,
-					{
-						cases: {
-							'@flowchartBlockKeywords': 'typeKeyword',
-							'@flowchartKeywords': 'keyword',
-							'@default': 'variable'
-						}
-					}
-				],
-				[/\|+.+?\|+/, 'string'],
-				[/\[+(\\.+?[\\/]|\/.+?[/\\])\]+/, 'string'],
-				[/[[>]+[^\]|[]+?\]+/, 'string'],
-				[/{+.+?}+/, 'string'],
-				[/\(+.+?\)+/, 'string'],
-				[/-\.+->?/, 'transition'],
-				[/(-[-.])([^->]+?)(-{3,}|-{2,}>|\.-+>)/, ['transition', 'string', 'transition']],
-				[/(==+)([^=]+?)(={3,}|={2,}>)/, ['transition', 'string', 'transition']],
-				[/<?(--+|==+)>|===+|---+/, 'transition'],
-				[/:::/, 'transition'],
-				[/[;&]/, 'delimiter.bracket'],
-				[/".*?"/, 'string'],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
-			],
-			sequenceDiagram: [
-				[
-					/[a-zA-Z][\w$]*/,
-					{
-						cases: {
-							'@sequenceDiagramBlockKeywords': 'typeKeyword',
-							'@sequenceDiagramKeywords': 'keyword',
-							'@default': 'variable'
-						}
-					}
-				],
-				[/(--?>?>|--?[)x])[+-]?/, 'transition'],
-				[/(:)([^:\n]*?$)/, ['delimiter.bracket', 'string']],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
-			],
-			classDiagram: [
-				[/(?!class\s)([a-zA-Z]+)(\s+[a-zA-Z]+)/, ['type', 'variable']],
-				[/(\*|<\|?|o)?(--|\.\.)(\*|\|?>|o)?/, 'transition'],
-				[/^\s*class\s(?!.*\{)/, 'keyword'],
-				[
-					/[a-zA-Z][\w$]*/,
-					{
-						cases: {
-							'@classDiagramBlockKeywords': 'typeKeyword',
-							'@classDiagramKeywords': 'keyword',
-							'@default': 'variable'
-						}
-					}
-				],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
-				[/(<<)(.+?)(>>)/, ['delimiter.bracket', 'annotation', 'delimiter.bracket']],
-				[/".*?"/, 'string'],
-				[/:::/, 'transition'],
-				[/:|\+|-|#|~|\*\s*$|\$\s*$|\(|\)|{|}/, 'delimiter.bracket']
-			],
-			journey: [
-				[/(title)(.*)/, ['keyword', 'string']],
-				[/(section)(.*)/, ['typeKeyword', 'string']],
-				[
-					/[a-zA-Z][\w$]*/,
-					{
-						cases: {
-							'@journeyBlockKeywords': 'typeKeyword',
-							'@journeyKeywords': 'keyword',
-							'@default': 'variable'
-						}
-					}
-				],
-				[
-					/(^\s*.+?)(:)(.*?)(:)(.*?)([,$])/,
-					[
-						'string',
-						'delimiter.bracket',
-						'number',
-						'delimiter.bracket',
-						'variable',
-						'delimiter.bracket'
-					]
-				],
-				[/,/, 'delimiter.bracket'],
-				[/(^\s*.+?)(:)([^:]*?)$/, ['string', 'delimiter.bracket', 'variable']],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
-			],
-			gantt: [
-				[/(title)(.*)/, ['keyword', 'string']],
-				[/(section)(.*)/, ['typeKeyword', 'string']],
-				[
-					/[a-zA-Z][\w$]*/,
-					{
-						cases: {
-							'@ganttBlockKeywords': 'typeKeyword',
-							'@ganttKeywords': 'keyword'
-						}
-					}
-				],
-				[/(^\s*.*?)(:)/, ['string', 'delimiter.bracket']],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
-				[/:/, 'delimiter.bracket']
-			],
-			stateDiagram: [
-				[/note[^:]*$/, { token: 'typeKeyword', next: 'stateDiagramNote' }],
-				['hide empty description', 'keyword'],
-				[/^\s*state\s(?!.*\{)/, 'keyword'],
-				[/(<<)(fork|join|choice)(>>)/, 'annotation'],
-				[/(\[\[)(fork|join|choice)(]])/, ['delimiter.bracket', 'annotation', 'delimiter.bracket']],
-				[
-					/[a-zA-Z][\w$]*/,
-					{
-						cases: {
-							'@stateDiagramBlockKeywords': 'typeKeyword',
-							'@stateDiagramKeywords': 'keyword',
-							'@default': 'variable'
-						}
-					}
-				],
-				[/".*?"/, 'string'],
-				[/(:)([^:\n]*?$)/, ['delimiter.bracket', 'string']],
-				[/{|}/, 'delimiter.bracket'],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
-				[/-->/, 'transition'],
-				[/\[.*?]/, 'string']
-			],
-			stateDiagramNote: [
-				[/^\s*end note$/, { token: 'typeKeyword', next: '@pop' }],
-				[/.*/, 'string']
-			],
-			erDiagram: [
-				[/[}|][o|](--|\.\.)[o|][{|]/, 'transition'],
-				[/".*?"/, 'string'],
-				[/(:)(.*?$)/, ['delimiter.bracket', 'string']],
-				[/:|{|}/, 'delimiter.bracket'],
-				[/([a-zA-Z]+)(\s+[a-zA-Z]+)/, ['type', 'variable']],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
-				[/[a-zA-Z_-][\w$]*/, 'variable']
-			],
-			requirementDiagram: [
-				[/->|<-|-/, 'transition'],
-				[/(\d+\.)*\d+/, 'number'],
-				[
-					/[a-zA-Z_-][\w$]*/,
-					{
-						cases: {
-							'@requirementDiagramBlockKeywords': 'typeKeyword',
-							'@default': 'variable'
-						}
-					}
-				],
-				[/:|{|}|\//, 'delimiter.bracket'],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
-				[/".*?"/, 'string']
-			]
-		}
-	});
-
-	monacoEditor.editor.defineTheme('mermaid-dark', {
-		base: 'vs-dark',
-		inherit: true,
-		rules: [
-			{ token: 'typeKeyword', foreground: '9650c8', fontStyle: 'bold' },
-			{ token: 'transition', foreground: '008800', fontStyle: 'bold' }
-		],
-		colors: {}
-	});
-
-	monacoEditor.editor.defineTheme('mermaid', {
-		base: 'vs',
-		inherit: true,
-		rules: [
-			{ token: 'typeKeyword', foreground: '9650c8', fontStyle: 'bold' },
-			{ token: 'keyword', foreground: '649696' },
-			{ token: 'custom-error', foreground: 'ff0000', fontStyle: 'bold' },
-			{ token: 'string', foreground: 'AA8500' },
-			{ token: 'transition', foreground: '008800', fontStyle: 'bold' },
-			{ token: 'delimiter.bracket', foreground: '000000', fontStyle: 'bold' },
-			{ token: 'annotation', foreground: '4b4b96' },
-			{ token: 'number', foreground: '4b4b96' },
-			{ token: 'comment', foreground: '888c89' },
-			{ token: 'variable', foreground: 'A22889' },
-			{ token: 'type', foreground: '2BDEA8' }
-		],
-		colors: {}
-	});
-
-	// Register a completion item provider for the mermaid language
-	monacoEditor.languages.registerCompletionItemProvider('mermaid', {
-		provideCompletionItems: () => {
-			const suggestions = [
-				{
-					label: 'loop',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['loop ${1:Loop text}', '\t$0', 'end'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Sequence Diagram Loops'
-				},
-				{
-					label: 'alt',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['alt ${1:Describing text}', '\t$0', 'else', '\t', 'end'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Alternative Path'
-				},
-				{
-					label: 'opt',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['opt ${1:Describing text}', '\t$0', 'end'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Optional Path'
-				},
-				{
-					label: 'par',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: [
-						'par ${1:[Action 1]}',
-						'\t$0',
-						'and ${2:[Action 2]}',
-						'\t',
-						'and ${3:[Action 3]}',
-						'\t',
-						'end'
-					].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Parallel Actions'
-				},
-				{
-					label: 'rect',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['rect ${1:rgb(0, 255, 0)}', '\t$0', 'end'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Background Color'
-				},
-				{
-					label: 'subgraph',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['subgraph ${1:title}', '\t$0', 'end'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Subgraph'
-				},
-				{
-					label: 'class',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['class ${1:className} {', '\t$0', '}'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Class'
-				},
-				{
-					label: 'state',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['state ${1:stateName} {', '\t$0', '}'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'State'
-				},
-				{
-					label: 'note',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['note ${1:right of State1}', '\t$0', 'end note'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'State'
-				},
-				{
-					label: 'section',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['section ${1:Go to work}', '\t$0'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'User-journey Section'
-				},
-				{
-					label: 'element',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['element ${1:test_entity} {', '\t$0', '}'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Requirement Diagram Element'
-				},
-				{
-					label: 'options',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['options', '{', '    $0', '}', 'end'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Git Graph Options'
-				},
-				...requirementDiagrams.map((requirementDiagramType) => ({
-					label: requirementDiagramType,
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: [
-						requirementDiagramType + ' ${1:test_req} {',
-						'\tid: 1',
-						'\ttext: the test text.',
-						'\trisk: high',
-						'\tverifyMethod: test',
-						'}'
-					].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: requirementDiagramType
-						.split(/(?=[A-Z])/)
-						.map((part) => part[0].toUpperCase() + part.slice(1))
-						.join(' ')
-				})),
-				...[
-					...new Set(
-						Object.values(keywords)
-							.map((diagramKeywords) =>
-								Object.entries(diagramKeywords)
-									.filter((keywordType) => keywordType[0] !== 'annotations')
-									.map((entry) => entry[1])
-							)
-							.flat(2)
-					)
-				].map((keyword) => ({
-					label: keyword,
-					kind: monacoEditor.languages.CompletionItemKind.Keyword,
-					insertText: keyword
-				}))
-			];
-			return { suggestions: suggestions };
-		}
-	});
-
-	monacoEditor.languages.setLanguageConfiguration('mermaid', {
-		autoClosingPairs: [
-			{
-				open: '(',
-				close: ')'
-			},
-			{
-				open: '{',
-				close: '}'
-			},
-			{
-				open: '[',
-				close: ']'
-			}
-		],
-		brackets: [
-			['(', ')'],
-			['{', '}'],
-			['[', ']']
-		]
-	});
-};

src/lib/util/fileLoaders/gist.ts

@@ -5,108 +5,14 @@ import type { State } from '$lib/types';
 import { defaultState } from '../state';
 import { addHistoryEntry } from '../../components/history/history';
 
-export interface GistResponse {
-	url: string;
-	forks_url: string;
-	commits_url: string;
-	id: string;
-	node_id: string;
-	git_pull_url: string;
-	git_push_url: string;
-	html_url: string;
-	files: Files;
-	public: boolean;
-	created_at: string;
-	updated_at: string;
-	description: string;
-	comments: number;
-	user: any;
-	comments_url: string;
-	owner: Owner;
-	fork_of: any;
-	forks: any[];
-	history: History[];
-	truncated: boolean;
-}
-
-export interface Files {
-	[key: string]: File;
-}
-
-export interface File {
-	filename: string;
-	type: string;
-	language: any;
-	raw_url: string;
-	size: number;
-	truncated: boolean;
-	content: string;
-}
-
-export interface Owner {
-	login: string;
-	id: number;
-	node_id: string;
-	avatar_url: string;
-	gravatar_id: string;
-	url: string;
-	html_url: string;
-	followers_url: string;
-	following_url: string;
-	gists_url: string;
-	starred_url: string;
-	subscriptions_url: string;
-	organizations_url: string;
-	repos_url: string;
-	events_url: string;
-	received_events_url: string;
-	type: string;
-	site_admin: boolean;
-}
-
-export interface History {
-	user: User;
-	version: string;
-	committed_at: string;
-	change_status: ChangeStatus;
-	url: string;
-}
-
-export interface User {
-	login: string;
-	id: number;
-	node_id: string;
-	avatar_url: string;
-	gravatar_id: string;
-	url: string;
-	html_url: string;
-	followers_url: string;
-	following_url: string;
-	gists_url: string;
-	starred_url: string;
-	subscriptions_url: string;
-	organizations_url: string;
-	repos_url: string;
-	events_url: string;
-	received_events_url: string;
-	type: string;
-	site_admin: boolean;
-}
-
-export interface ChangeStatus {
-	total: number;
-	additions: number;
-	deletions: number;
-}
-
 const codeFileName = 'code.mmd';
 const configFileName = 'config.json';
 
-const isValidGist = (files: Files): boolean => {
+const isValidGist = (files: any): boolean => {
 	return codeFileName in files;
 };
 
-const getFileContent = async (file: File): Promise<string> => {
+const getFileContent = async (file: any): Promise<string> => {
 	if (file.truncated) {
 		return await (await fetch(file.raw_url)).text();
 	}
@@ -126,9 +32,9 @@ const getGistData = async (gistURL: string): Promise<GistData> => {
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	const [_, __, gistID, revisionID] = gistURL.split('github.com').pop().split('/');
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-	const { html_url, files, history } = (await (
+	const { html_url, files, history } = await (
 		await fetch(`https://api.github.com/gists/${gistID}${revisionID ? '/' + revisionID : ''}`)
-	).json()) as GistResponse;
+	).json();
 	if (isValidGist(files)) {
 		const code = await getFileContent(files[codeFileName]);
 		let config: string;
@@ -142,7 +48,7 @@ const getGistData = async (gistURL: string): Promise<GistData> => {
 			config,
 			author: currentItem.user.login,
 			time: new Date(currentItem.committed_at).getTime(),
-			version: currentItem.version.slice(-7)
+			version: (currentItem.version as string).slice(-7)
 		};
 	} else {
 		throw 'Invalid gist provided';

src/routes/edit.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Editor from '$lib/components/editor/editor.svelte';
+	import Editor from '$lib/components/editor.svelte';
 	import Navbar from '$lib/components/navbar.svelte';
 	import Preset from '$lib/components/preset.svelte';
 	import Actions from '$lib/components/actions.svelte';

svelte.config.js

@@ -19,8 +19,6 @@ const config = {
 					base: `/mermaid-live-editor${process.env['BETA'] ? '/beta' : ''}`
 			  }
 			: {},
-		// hydrate the <div id="svelte"> element in src/app.html
-		target: '#svelte',
 		trailingSlash: 'ignore',
 		vite: {
 			envPrefix: 'MERMAID_',