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. mermaid-js#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
  ...

.eslintrc.cjs

@@ -7,7 +7,7 @@ module.exports = {
 		// 'plugin:@typescript-eslint/recommended-requiring-type-checking',
 		'prettier'
 	],
-	plugins: ['svelte3', 'tailwindcss', '@typescript-eslint'],
+	plugins: ['svelte3', 'tailwindcss', '@typescript-eslint', 'es'],
 	ignorePatterns: [
 		'docs/*',
 		'*.cjs',
@@ -42,6 +42,7 @@ module.exports = {
 			}
 		],
 		'@typescript-eslint/no-unsafe-member-access': 'off',
-		'@typescript-eslint/no-unsafe-assignment': 'off'
+		'@typescript-eslint/no-unsafe-assignment': 'off',
+		'es/no-regexp-lookbehind-assertions': 'error'
 	}
 };

.github/dependabot.yml

@@ -1,8 +1,20 @@
 version: 2
 updates:
-  - package-ecosystem: 'npm'
-    directory: '/'
-    target-branch: 'develop'
+  - package-ecosystem: docker
+    directory: /
+    target-branch: develop
     schedule:
-      interval: 'weekly'
-      day: 'friday'
+      interval: weekly
+      day: friday
+  - package-ecosystem: github-actions
+    directory: /
+    target-branch: develop
+    schedule:
+      interval: weekly
+      day: friday
+  - package-ecosystem: npm
+    directory: /
+    target-branch: develop
+    schedule:
+      interval: weekly
+      day: friday

.github/workflows/cypress.yml

@@ -9,6 +9,7 @@ on:
 jobs:
   cypress-run:
     runs-on: ubuntu-latest
+    # Update after https://github.com/cypress-io/cypress-docker-images/issues/487
     container: cypress/browsers:node14.16.0-chrome90-ff88
 
     steps:

.github/workflows/deploy.yml

@@ -6,13 +6,14 @@ on:
   pull_request:
     branches:
       - master
+      - develop
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: '16'
 
       - name: Checkout
         uses: actions/checkout@v2
@@ -45,6 +46,7 @@ jobs:
 
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
+        if: ${{ github.ref == 'refs/heads/master' }}
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./docs

.github/workflows/stale.yml

@@ -8,7 +8,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v3
+      - uses: actions/stale@v4
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           exempt-issue-labels: 'retained'

Dockerfile

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

package.json

@@ -15,43 +15,44 @@
 	},
 	"devDependencies": {
 		"@cypress/snapshot": "^2.1.7",
-		"@sveltejs/adapter-static": "1.0.0-next.17",
+		"@sveltejs/adapter-static": "1.0.0-next.18",
 		"@sveltejs/kit": "1.0.0-next.147",
 		"@types/mermaid": "^8.2.7",
-		"@typescript-eslint/eslint-plugin": "^4.30.0",
-		"@typescript-eslint/parser": "^4.30.0",
-		"autoprefixer": "^10.3.3",
+		"@typescript-eslint/eslint-plugin": "^4.31.0",
+		"@typescript-eslint/parser": "^4.31.0",
+		"autoprefixer": "^10.3.4",
 		"chai": "^4.3.4",
 		"cssnano": "^5.0.8",
 		"cypress": "8.3.1",
 		"cypress-localstorage-commands": "^1.5.0",
 		"eslint": "^7.32.0",
 		"eslint-config-prettier": "^8.1.0",
 		"eslint-plugin-cypress": "^2.11.3",
+		"eslint-plugin-es": "^4.1.0",
 		"eslint-plugin-mocha": "^9.0.0",
 		"eslint-plugin-postcss-modules": "^1.2.1",
-		"eslint-plugin-svelte3": "^3.2.0",
+		"eslint-plugin-svelte3": "^3.2.1",
 		"eslint-plugin-tailwindcss": "^1.14.3",
 		"husky": "^7.0.2",
 		"lint-staged": "^11.1.2",
 		"mocha": "^9.1.1",
 		"postcss": "^8.3.6",
 		"postcss-load-config": "^3.1.0",
-		"prettier": "~2.3.2",
+		"prettier": "~2.4.0",
 		"prettier-plugin-svelte": "^2.4.0",
-		"svelte": "^3.42.4",
+		"svelte": "^3.42.5",
 		"svelte-preprocess": "^4.8.0",
-		"tailwindcss": "^2.2.9",
+		"tailwindcss": "^2.2.15",
 		"tslib": "^2.3.1",
-		"typescript": "^4.4.2"
+		"typescript": "^4.4.3"
 	},
 	"type": "module",
 	"dependencies": {
 		"@analytics/google-analytics": "^0.5.3",
 		"@macfja/svelte-persistent-store": "^1.2.0",
 		"daisyui": "^1.14.0",
 		"analytics": "^0.7.14",
-		"js-base64": "^3.6.1",
+		"js-base64": "^3.7.0",
 		"mermaid": "^8.12.1",
 		"moment": "^2.29.1",
 		"monaco-editor": "^0.27.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;