Merge branch 'master' into daisyUI

* master: (25 commits)
  chore(deps-dev): bump typescript from 4.4.2 to 4.4.3
  chore(deps-dev): bump svelte from 3.42.4 to 3.42.5
  chore(deps): bump js-base64 from 3.6.2 to 3.7.0
  chore(deps): bump node from 16.8.0 to 16.9.0
  Skip beta deploy
  [ImgBot] Optimize images
  Dont allow lookbehind in regexp
  Fix no lookbehinds in comments
  chore(deps-dev): bump tailwindcss from 2.2.11 to 2.2.15
  chore(deps-dev): bump eslint-plugin-svelte3 from 3.2.0 to 3.2.1
  chore(deps-dev): bump prettier from 2.3.2 to 2.4.0
  Test deploy on PRs
  Fix manifest issue
  Update node
  Add back Highlighting. #340
  chore(deps-dev): bump @typescript-eslint/eslint-plugin
  chore(deps-dev): bump @typescript-eslint/parser from 4.30.0 to 4.31.0
  chore(deps): bump js-base64 from 3.6.1 to 3.6.2
  chore(deps-dev): bump tailwindcss from 2.2.9 to 2.2.11
  chore(deps): bump node from 14.17.0 to 16.8.0
  ...

src/app.html

@@ -8,7 +8,7 @@
 			name="og:image"
 			content="https://github.com/mermaid-js/mermaid/raw/develop/img/header.png"
 		/>
-		<link rel="canonical" href="https://mermaid-js.github.io/mermaid-live-editor/" />
+		<link rel="canonical" href="https://mermaid.live" />
 		<meta
 			name="description"
 			content="Simplify documentation and avoid heavy tools. Open source Visio Alternative. Commonly used for explaining your code! Mermaid is a simple markdown-like script language for generating charts from text via javascript."

src/lib/components/editor/util.ts

@@ -156,7 +156,7 @@ export const initEditor = (monacoEditor): void => {
 				[/^\s*stateDiagram(-v2)?/, 'typeKeyword', 'stateDiagram'],
 				[/^\s*erDiagram/, 'typeKeyword', 'erDiagram'],
 				[/^\s*requirement(Diagram)?/, 'typeKeyword', 'requirementDiagram'],
-				[/%%.*(?<!%%)$/, 'comment']
+				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
 			],
 			gitGraph: [
 				[/option(?=s)/, { token: 'typeKeyword', next: 'optionsGitGraph' }],
@@ -170,7 +170,7 @@ export const initEditor = (monacoEditor): void => {
 						}
 					}
 				],
-				[/%%.*(?<!%%)$/, 'comment'],
+				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
 				[/".*?"/, 'string'],
 				[/\^/, 'delimiter.bracket']
 			],
@@ -203,7 +203,7 @@ export const initEditor = (monacoEditor): void => {
 				[/".*?"/, 'string'],
 				[/\s*\d+/, 'number'],
 				[/:/, 'delimiter.bracket'],
-				[/%%.*(?<!%%)$/, 'comment']
+				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
 			],
 			flowchart: [
 				[/[ox]?(--+|==+)[ox]/, 'transition'],
@@ -229,7 +229,7 @@ export const initEditor = (monacoEditor): void => {
 				[/:::/, 'transition'],
 				[/[;&]/, 'delimiter.bracket'],
 				[/".*?"/, 'string'],
-				[/%%.*(?<!%%)$/, 'comment']
+				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
 			],
 			sequenceDiagram: [
 				[
@@ -244,7 +244,7 @@ export const initEditor = (monacoEditor): void => {
 				],
 				[/(--?>?>|--?[)x])[+-]?/, 'transition'],
 				[/(:)([^:\n]*?$)/, ['delimiter.bracket', 'string']],
-				[/%%.*(?<!%%)$/, 'comment']
+				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
 			],
 			classDiagram: [
 				[/(?!class\s)([a-zA-Z]+)(\s+[a-zA-Z]+)/, ['type', 'variable']],
@@ -260,7 +260,7 @@ export const initEditor = (monacoEditor): void => {
 						}
 					}
 				],
-				[/%%.*(?<!%%)$/, 'comment'],
+				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
 				[/(<<)(.+?)(>>)/, ['delimiter.bracket', 'annotation', 'delimiter.bracket']],
 				[/".*?"/, 'string'],
 				[/:::/, 'transition'],
@@ -292,7 +292,7 @@ export const initEditor = (monacoEditor): void => {
 				],
 				[/,/, 'delimiter.bracket'],
 				[/(^\s*.+?)(:)([^:]*?)$/, ['string', 'delimiter.bracket', 'variable']],
-				[/%%.*(?<!%%)$/, 'comment']
+				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
 			],
 			gantt: [
 				[/(title)(.*)/, ['keyword', 'string']],
@@ -307,7 +307,7 @@ export const initEditor = (monacoEditor): void => {
 					}
 				],
 				[/(^\s*.*?)(:)/, ['string', 'delimiter.bracket']],
-				[/%%.*(?<!%%)$/, 'comment'],
+				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
 				[/:/, 'delimiter.bracket']
 			],
 			stateDiagram: [
@@ -329,7 +329,7 @@ export const initEditor = (monacoEditor): void => {
 				[/".*?"/, 'string'],
 				[/(:)([^:\n]*?$)/, ['delimiter.bracket', 'string']],
 				[/{|}/, 'delimiter.bracket'],
-				[/%%.*(?<!%%)$/, 'comment'],
+				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
 				[/-->/, 'transition'],
 				[/\[.*?]/, 'string']
 			],
@@ -343,7 +343,7 @@ export const initEditor = (monacoEditor): void => {
 				[/(:)(.*?$)/, ['delimiter.bracket', 'string']],
 				[/:|{|}/, 'delimiter.bracket'],
 				[/([a-zA-Z]+)(\s+[a-zA-Z]+)/, ['type', 'variable']],
-				[/%%.*(?<!%%)$/, 'comment'],
+				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
 				[/[a-zA-Z_-][\w$]*/, 'variable']
 			],
 			requirementDiagram: [
@@ -359,7 +359,7 @@ export const initEditor = (monacoEditor): void => {
 					}
 				],
 				[/:|{|}|\//, 'delimiter.bracket'],
-				[/%%.*(?<!%%)$/, 'comment'],
+				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
 				[/".*?"/, 'string']
 			]
 		}

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

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