Merge

.github/workflows/deploy.yml

@@ -17,14 +17,17 @@ jobs:
       - 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-and-build-cache
+        id: yarn-cache
         with:
-          path: |
-            node_modules
-          key: ${{ runner.os }}-node_modules-build-deploy-${{ hashFiles('**/yarn.lock') }}
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-node_modules-build-deploy-
+            ${{ runner.os }}-yarn-
 
       - name: Build & Deploy
         run: |

cypress/snapshots.js

@@ -7,7 +7,7 @@ module.exports = {
       "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]\",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"updateEditor\":false,\"autoSync\":true,\"updateDiagram\":false}"
     }
   },
-  "__version": "8.1.0",
+  "__version": "8.2.0",
   "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,17 +15,17 @@
 	},
 	"devDependencies": {
 		"@cypress/snapshot": "^2.1.7",
-		"@sveltejs/adapter-static": "1.0.0-next.13",
-		"@sveltejs/kit": "1.0.0-next.138",
+		"@sveltejs/adapter-static": "1.0.0-next.16",
+		"@sveltejs/kit": "1.0.0-next.147",
 		"@types/mermaid": "^8.2.7",
-		"@typescript-eslint/eslint-plugin": "^4.28.3",
-		"@typescript-eslint/parser": "^4.28.3",
+		"@typescript-eslint/eslint-plugin": "^4.29.1",
+		"@typescript-eslint/parser": "^4.29.1",
 		"autoprefixer": "^10.3.1",
 		"chai": "^4.3.4",
 		"cssnano": "^5.0.7",
-		"cypress": "8.1.0",
+		"cypress": "8.2.0",
 		"cypress-localstorage-commands": "^1.5.0",
-		"eslint": "^7.30.0",
+		"eslint": "^7.32.0",
 		"eslint-config-prettier": "^8.1.0",
 		"eslint-plugin-cypress": "^2.11.3",
 		"eslint-plugin-mocha": "^9.0.0",
@@ -33,28 +33,28 @@
 		"eslint-plugin-svelte3": "^3.2.0",
 		"eslint-plugin-tailwindcss": "^1.14.1",
 		"husky": "^7.0.1",
-		"lint-staged": "^11.0.1",
+		"lint-staged": "^11.1.2",
 		"mocha": "^9.0.2",
 		"postcss": "^8.3.6",
 		"postcss-load-config": "^3.1.0",
 		"prettier": "~2.3.2",
 		"prettier-plugin-svelte": "^2.3.1",
-		"svelte": "^3.41.0",
+		"svelte": "^3.42.1",
 		"svelte-preprocess": "^4.7.4",
 		"tailwindcss": "^2.2.7",
-		"tslib": "^2.3.0",
+		"tslib": "^2.3.1",
 		"typescript": "^4.3.5"
 	},
 	"type": "module",
 	"dependencies": {
 		"@analytics/google-analytics": "^0.5.3",
 		"@macfja/svelte-persistent-store": "^1.1.1",
-		"analytics": "^0.7.10",
+		"analytics": "^0.7.13",
 		"js-base64": "^3.6.1",
-		"mermaid": "^8.11.3",
+		"mermaid": "^8.11.4",
 		"moment": "^2.29.1",
 		"monaco-editor": "^0.25.2",
-		"random-word-slugs": "^0.0.2"
+		"random-word-slugs": "^0.0.5"
 	},
 	"lint-staged": {
 		"*.{ts,svelte,js,css,md,json}": [

src/lib/components/editor/editor.svelte

@@ -23,7 +23,7 @@
 	};
 	export let errorMarkers: monaco.editor.IMarkerData[] = [];
 	let oldText = text;
-	$: Monaco?.editor.setModelLanguage(editor.getModel(), language);
+	$: editor && Monaco?.editor.setModelLanguage(editor.getModel(), language);
 	$: {
 		if (text !== oldText) {
 			if ($codeStore.updateEditor) {
@@ -31,7 +31,7 @@
 			}
 			oldText = text;
 		}
-		Monaco?.editor.setModelMarkers(editor.getModel(), 'test', errorMarkers);
+		editor && Monaco?.editor.setModelMarkers(editor.getModel(), 'test', errorMarkers);
 	}
 
 	const dispatch = createEventDispatcher<EditorEvents>();