Merge pull request mermaid-js#489 from mermaid-js/develop

Develop

.github/workflows/update-browserlist.yml

@@ -0,0 +1,16 @@
+name: Update Browserslist
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npx browserslist@latest --update-db
+      - name: Commit changes
+        uses: EndBug/add-and-commit@v7
+        with:
+          author_name: ${{ github.actor }}
+          author_email: ${{ github.actor }}@users.noreply.github.com
+          message: 'Update Browserslist'

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

@@ -4,7 +4,7 @@ on:
   pull_request:
     types: [opened]
     branches:
-      - 'dependabot/npm_and_yarn/develop/monaco-editor-*'
+      - 'dependabot/npm_and_yarn/develop/monaco-editor-**'
 
 jobs:
   build:

Dockerfile

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

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM node:16
+FROM node:17
 WORKDIR /app
 COPY package.json .
 COPY yarn.lock .

package.json

@@ -16,23 +16,23 @@
 	"devDependencies": {
 		"@cypress/snapshot": "^2.1.7",
 		"@sveltejs/adapter-static": "1.0.0-next.21",
-		"@sveltejs/kit": "1.0.0-next.192",
+		"@sveltejs/kit": "1.0.0-next.196",
 		"@types/mermaid": "^8.2.7",
 		"@typescript-eslint/eslint-plugin": "^4.33.0",
 		"@typescript-eslint/parser": "^4.33.0",
 		"autoprefixer": "^10.4.0",
 		"chai": "^4.3.4",
-		"cssnano": "^5.0.8",
+		"cssnano": "^5.0.10",
 		"cypress": "8.7.0",
-		"cypress-localstorage-commands": "^1.5.0",
+		"cypress-localstorage-commands": "^1.6.1",
 		"eslint": "^7.32.0",
 		"eslint-config-prettier": "^8.1.0",
 		"eslint-plugin-cypress": "^2.12.1",
 		"eslint-plugin-es": "^4.1.0",
 		"eslint-plugin-mocha": "^9.0.0",
 		"eslint-plugin-postcss-modules": "^1.2.1",
 		"eslint-plugin-svelte3": "^3.2.1",
-		"eslint-plugin-tailwindcss": "^1.17.0",
+		"eslint-plugin-tailwindcss": "^1.17.1",
 		"husky": "^7.0.4",
 		"lint-staged": "^11.2.6",
 		"mocha": "^9.1.3",
@@ -41,7 +41,7 @@
 		"postcss-load-config": "^3.1.0",
 		"prettier": "~2.4.1",
 		"prettier-plugin-svelte": "^2.4.0",
-		"svelte": "^3.44.0",
+		"svelte": "^3.44.1",
 		"svelte-preprocess": "^4.9.8",
 		"tailwindcss": "^2.2.19",
 		"tslib": "^2.3.1",
@@ -51,13 +51,13 @@
 	"dependencies": {
 		"@analytics/google-analytics": "^0.5.3",
 		"@macfja/svelte-persistent-store": "^1.2.0",
-		"analytics": "^0.7.17",
-		"daisyui": "1.16.0",
+		"analytics": "^0.7.18",
+		"daisyui": "1.16.2",
 		"js-base64": "^3.7.2",
 		"mermaid": "8.13.3",
 		"moment": "^2.29.1",
-		"monaco-editor": "^0.29.1",
-		"random-word-slugs": "^0.1.5"
+		"monaco-editor": "^0.30.1",
+		"random-word-slugs": "^0.1.6"
 	},
 	"lint-staged": {
 		"*.{ts,svelte,js,css,md,json}": [

src/app.html

@@ -21,27 +21,27 @@
 		/>
 		<link
 			rel="stylesheet"
-			href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.29.1/min/vs/editor/editor.main.min.css"
+			href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.30.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.29.1/min/vs' }
+				paths: { vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.30.1/min/vs' }
 			};
 		</script>
 		<script
-			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.29.1/min/vs/loader.min.js"
+			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.30.1/min/vs/loader.min.js"
 			crossorigin="anonymous"
 			referrerpolicy="no-referrer"
 		></script>
 		<script
-			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.29.1/min/vs/editor/editor.main.nls.min.js"
+			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.30.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.29.1/min/vs/editor/editor.main.js"
+			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.30.1/min/vs/editor/editor.main.js"
 			crossorigin="anonymous"
 			referrerpolicy="no-referrer"
 		></script>

src/lib/components/editor/util.ts

@@ -372,7 +372,8 @@ export const initEditor = (monacoEditor): void => {
 		rules: [
 			{ token: 'typeKeyword', foreground: '9650c8', fontStyle: 'bold' },
 			{ token: 'transition', foreground: '008800', fontStyle: 'bold' }
-		]
+		],
+		colors: {}
 	});
 
 	monacoEditor.editor.defineTheme('mermaid', {
@@ -390,7 +391,8 @@ export const initEditor = (monacoEditor): void => {
 			{ token: 'comment', foreground: '888c89' },
 			{ token: 'variable', foreground: 'A22889' },
 			{ token: 'type', foreground: '2BDEA8' }
-		]
+		],
+		colors: {}
 	});
 
 	// Register a completion item provider for the mermaid language