Fix favicon

.eslintrc.cjs

@@ -11,7 +11,6 @@ module.exports = {
 	ignorePatterns: [
 		'docs/*',
 		'*.cjs',
-		'*.js',
 		'*.md',
 		'snapshots.js',
 		'svelte.config.js',
@@ -28,8 +27,7 @@ module.exports = {
 		ecmaVersion: 2019,
 		tsconfigRootDir: __dirname,
 		project: ['./tsconfig.json'],
-		extraFileExtensions: ['.svelte'],
-		allowAutomaticSingleRunInference: true
+		extraFileExtensions: ['.svelte']
 	},
 	env: {
 		browser: true,

.github/workflows/codeql-analysis.yml

@@ -35,11 +35,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v1
         with:
           config-file: ./.github/codeql/config.yml
           languages: ${{ matrix.language }}
@@ -65,4 +65,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v1

.github/workflows/cypress.yml

@@ -9,12 +9,14 @@ 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:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v2
         id: yarn-and-build-cache
         with:
           path: |
@@ -25,22 +27,17 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node_modules-build-
 
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          cache: 'yarn'
-
-      - name: Build & Lint
+      - name: Lint
         run: |
           yarn install
-          yarn build
-          yarn lint
+          yarn run lint
 
       # Install NPM dependencies, cache them correctly
       # and run all Cypress tests
       - name: Cypress run
-        uses: cypress-io/github-action@v3
+        uses: cypress-io/github-action@v2
         with:
+          build: yarn build
           start: yarn preview
           wait-on: 'http://localhost:3000'
           record: true

.github/workflows/deploy.yml

@@ -11,22 +11,37 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v2
         with:
           node-version: '16'
-          cache: yarn
+
+      - 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
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
 
       - name: Build & Deploy
         run: |
+          npm i -g yarn
           export DEPLOY=true
+          [ "$GITHUB_EVENT_NAME" == "pull_request" ] && export BETA=true && rm -rf docs/beta/
           [ "$GITHUB_EVENT_NAME" != "pull_request" ] && rm -rf docs/_app/
           yarn install
+          yarn run lint
           version=$(yarn version --patch --no-git-tag-version | grep "New version" | cut -d':' -f 2)
           yarn build
-          yarn run lint
+          cd bin
+          ./fix-path
           cd ..
 
       - name: Deploy

.github/workflows/docker-publish.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - name: Run tests
         run: |
@@ -38,7 +38,7 @@ jobs:
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - name: Build image
         run: docker build . --file Dockerfile --tag $IMAGE_NAME

.github/workflows/stale.yml

@@ -8,13 +8,10 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v4
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           exempt-issue-labels: 'retained'
           exempt-pr-labels: 'retained'
-          stale-issue-message: 'This issue is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 14 days'
-          stale-pr-message: 'This pr is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 14 days'
-          days-before-stale: 90
-          days-before-close: 14
-          days-before-pr-close: -1
+          stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days'
+          stale-pr-message: 'This pr is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days'

.github/workflows/update-browserlist.yml

@@ -1,18 +1,15 @@
 name: Update Browserslist
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - develop
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - run: npx browserslist@latest --update-db
       - name: Commit changes
-        uses: EndBug/add-and-commit@v9
+        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,7 +1,7 @@
 name: Update Monaco-editor
 on:
   workflow_dispatch:
-  push:
+  pull_request:
     branches:
       - 'dependabot/npm_and_yarn/develop/monaco-editor-**'
 
@@ -9,10 +9,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - run: ./bin/update-monaco
       - name: Commit changes
-        uses: EndBug/add-and-commit@v9
+        uses: EndBug/add-and-commit@v8
         with:
           author_name: ${{ github.actor }}
           author_email: ${{ github.actor }}@users.noreply.github.com

Dockerfile

@@ -6,12 +6,11 @@
 # Stop               : press ctrl + c 
 #                                     or 
 #                                        docker stop mermaid-live-editor
-FROM node:18.3.0 as mermaid-live-editor-builder 
+FROM node:17.4.0 as mermaid-live-editor-builder 
 COPY --chown=node:node . /home
 WORKDIR /home
 RUN yarn install
 RUN yarn build
 
 FROM nginx:alpine as mermaid-live-editor-runner
-COPY ./nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=mermaid-live-editor-builder --chown=nginx:nginx /home/docs /usr/share/nginx/html

Dockerfile.dev

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

SECURITY.md

@@ -1,13 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Live editor only has a single version, which will be maintained.
-
-| Version | Supported          |
-| ------- | ------------------ |
-| latest   | :white_check_mark: |
-
-## Reporting a Vulnerability
-
-To report a vulnerability, please e-mail security@mermaid.live with a description of the issue, the steps you took to create the issue, affected versions, and if known, mitigations for the issue.

cypress.config.js

@@ -1,26 +0,0 @@
-import { defineConfig } from 'cypress';
-import fs from 'fs';
-
-export default defineConfig({
-	projectId: '2ckppp',
-	viewportWidth: 1440,
-	viewportHeight: 768,
-	snapshotFileName: './cypress/snapshots.js',
-	defaultCommandTimeout: 16000,
-	requestTimeout: 16000,
-	e2e: {
-		setupNodeEvents(on, config) {
-			on('task', {
-				readFileMaybe(filename) {
-					if (fs.existsSync(filename)) {
-						return fs.readFileSync(filename, 'utf8');
-					}
-
-					return null;
-				}
-			});
-		},
-		baseUrl: 'http://localhost:3000',
-		specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}'
-	}
-});

cypress.json

@@ -0,0 +1,11 @@
+{
+	"projectId": "2ckppp",
+	"$schema": "https://on.cypress.io/cypress.schema.json",
+	"baseUrl": "http://localhost:3000",
+	"pluginsFile": "./cypress/plugins/index.cjs",
+	"viewportWidth": 1440,
+	"viewportHeight": 768,
+	"snapshotFileName": "./cypress/snapshots.js",
+	"defaultCommandTimeout": 16000,
+	"requestTimeout": 16000
+}

cypress/e2e/docMap.spec.ts

@@ -1,36 +0,0 @@
-describe('Editor docs tests', () => {
-	beforeEach(() => {
-		cy.on('uncaught:exception', () => {
-			return false;
-		});
-		cy.clearLocalStorage();
-		cy.visit('/edit');
-		cy.contains('Sample Diagrams').click();
-	});
-
-	it('Test default loading', () => {
-		cy.get(`[data-cy=docs][href^="https://mermaid-js.github.io/mermaid"]`).should('exist');
-	});
-
-	it('Test to see if the correct URL loads when changing from one diagram to other', () => {
-		cy.contains('Flow Chart').click();
-		cy.get(`[data-cy=docs][href$="/#/flowchart"]`).should('exist');
-
-		cy.contains('Config').click();
-		cy.get(`[data-cy=docs][href$="/#/flowchart?id=configuration"]`).should('exist');
-
-		cy.contains('Sequence Diagram').click();
-		cy.get(`[data-cy=docs][href$="/#/sequenceDiagram?id=configuration"]`).should('exist');
-
-		cy.contains('Code').click();
-		cy.get(`[data-cy=docs][href$="/#/sequenceDiagram"]`).should('exist');
-	});
-
-	it("Test to check URLs for a case where config URL doesn't exist", () => {
-		cy.contains('State Diagram').click();
-		cy.get(`[data-cy=docs][href$="/#/stateDiagram"]`).should('exist');
-
-		cy.contains('Config').click();
-		cy.get(`[data-cy=docs][href$="/#/stateDiagram"]`).should('exist');
-	});
-});

cypress/integration/history.spec.ts

@@ -46,9 +46,7 @@ describe('Save History', () => {
 		cy.get('#historyList').contains('No items in History');
 	});
 
-	// TODO: Fix #639
-	// eslint-disable-next-line mocha/no-skipped-tests
-	xit('should auto save history', () => {
+	it('should auto save history', () => {
 		cy.get('#editor').type('  C --> HistoryTest');
 		cy.tick(70000);
 		cy.contains('Timeline').click();

cypress/integration/loadSite.spec.ts

@@ -17,7 +17,7 @@ describe('Site Loads', () => {
 		);
 		cy.url().should(
 			'include',
-			'/edit#pako:eNpVkM1qw0AMhF9F6NRC_AI-FBo7zSXQQHLz-iC8cnZJ9oe1TAm2373rmkKrk9B8MwyasAuascRbomjgWisPed6byiQ7iKOhhaJ4m48s4ILn5wz7l2OAwYQYrb-9bvx-haCaTivGIMb6-7JJ1Y__0_MMdXOiKCG2f5XrV5jh0NizyfH_FZM4uz6ansqeio4SVJRa3KHj5MjqXHtaDQrFsGOFZV419zQ-RKHyS0bHqEn4oK2EhDnmMfAOaZRwefoOS0kj_0K1pfwFtx2XbzAdW4g'
+			'/edit#eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl0iLCJtZXJtYWlkIjp7InRoZW1lIjoiZGVmYXVsdCJ9LCJ1cGRhdGVFZGl0b3IiOmZhbHNlfQ'
 		);
 		cy.contains('History').click();
 		cy.getLocalStorage('codeStore').snapshot();

cypress/plugins/index.cjs

@@ -0,0 +1,31 @@
+/// <reference types="cypress" />
+// ***********************************************************
+// This example plugins/index.js can be used to load plugins
+//
+// You can change the location of this file or turn off loading
+// the plugins file with the 'pluginsFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/plugins-guide
+// ***********************************************************
+
+// This function is called when a project is opened or re-opened (e.g. due to
+// the project's config changing)
+
+/**
+ * @type {Cypress.PluginConfig}
+ */
+// eslint-disable-next-line no-unused-vars
+import * as fs from 'fs';
+
+module.exports = (on, config) => {
+	on('task', {
+		readFileMaybe(filename) {
+			if (fs.existsSync(filename)) {
+				return fs.readFileSync(filename, 'utf8');
+			}
+
+			return null;
+		}
+	});
+};

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": "10.0.3",
+  "__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}"

nginx.conf

@@ -1,9 +0,0 @@
-server { 
- listen 80;
- server_name mermaid;
- location / {
-   root /usr/share/nginx/html;
-	 # Fallback to index.html for other paths
-   try_files $uri /index.html;
- }
-}

package.json

@@ -5,60 +5,60 @@
 		"dev": "svelte-kit dev --host 0.0.0.0",
 		"build": "svelte-kit build",
 		"preview": "svelte-kit preview",
-		"lint": "prettier --check --plugin-search-dir=. .;eslint --ignore-path .gitignore .",
-		"lint:fix": "prettier --write --plugin-search-dir=. .;eslint --fix --ignore-path .gitignore .",
+		"lint": "prettier --check --plugin-search-dir=. . && eslint --ignore-path .gitignore .",
+		"lint:fix": "prettier --write --plugin-search-dir=. . && eslint --fix --ignore-path .gitignore .",
 		"format": "prettier --write --plugin-search-dir=. .",
 		"pre-commit": "lint-staged",
-		"postinstall": "husky install; cypress cache prune",
+		"postinstall": "husky install",
 		"test": "cypress run",
 		"cy": "cypress open"
 	},
 	"devDependencies": {
 		"@cypress/snapshot": "^2.1.7",
-		"@sveltejs/adapter-static": "1.0.0-next.34",
-		"@sveltejs/kit": "1.0.0-next.350",
-		"@types/mermaid": "^8.2.9",
+		"@sveltejs/adapter-static": "1.0.0-next.26",
+		"@sveltejs/kit": "1.0.0-next.260",
+		"@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.7",
+		"autoprefixer": "^10.4.2",
 		"chai": "^4.3.6",
-		"cssnano": "^5.1.11",
-		"cypress": "10.0.3",
-		"cypress-localstorage-commands": "^2.1.0",
+		"cssnano": "^5.0.16",
+		"cypress": "9.4.1",
+		"cypress-localstorage-commands": "^1.6.1",
 		"eslint": "^7.32.0",
-		"eslint-config-prettier": "^8.5.0",
+		"eslint-config-prettier": "^8.1.0",
 		"eslint-plugin-cypress": "^2.12.1",
 		"eslint-plugin-es": "^4.1.0",
-		"eslint-plugin-mocha": "^10.0.5",
+		"eslint-plugin-mocha": "^10.0.3",
 		"eslint-plugin-postcss-modules": "^2.0.0",
-		"eslint-plugin-svelte3": "^3.4.1",
-		"eslint-plugin-tailwindcss": "^3.5.2",
-		"husky": "^8.0.1",
-		"lint-staged": "13.0.1",
-		"mocha": "^10.0.0",
-		"node-html-parser": "^5.3.3",
-		"postcss": "^8.4.14",
-		"postcss-load-config": "^4.0.1",
-		"prettier": "~2.6.2",
-		"prettier-plugin-svelte": "^2.7.0",
-		"svelte": "^3.48.0",
-		"svelte-preprocess": "4.10.7",
-		"tailwindcss": "^3.1.1",
-		"tslib": "^2.4.0",
-		"typescript": "^4.7.3"
+		"eslint-plugin-svelte3": "^3.4.0",
+		"eslint-plugin-tailwindcss": "^3.4.3",
+		"husky": "^7.0.4",
+		"lint-staged": "^12.3.3",
+		"mocha": "^9.2.0",
+		"node-html-parser": "^5.2.0",
+		"postcss": "^8.4.6",
+		"postcss-load-config": "^3.1.1",
+		"prettier": "~2.5.1",
+		"prettier-plugin-svelte": "^2.6.0",
+		"svelte": "^3.46.4",
+		"svelte-preprocess": "^4.10.2",
+		"tailwindcss": "^3.0.18",
+		"tslib": "^2.3.1",
+		"typescript": "^4.5.5"
 	},
 	"type": "module",
 	"dependencies": {
 		"@analytics/google-analytics": "^0.5.3",
-		"@macfja/svelte-persistent-store": "^1.3.0",
-		"analytics": "^0.8.1",
-		"daisyui": "2.15.2",
+		"@macfja/svelte-persistent-store": "^1.2.0",
+		"analytics": "^0.7.21",
+		"daisyui": "1.25.4",
 		"js-base64": "^3.7.2",
-		"mermaid": "9.1.1",
-		"moment": "^2.29.3",
-		"monaco-editor": "^0.33.0",
-		"monaco-mermaid": "^1.0.4",
+		"mermaid": "8.13.10",
+		"moment": "^2.29.1",
+		"monaco-editor": "^0.32.0",
+		"monaco-mermaid": "^1.0.3",
 		"pako": "2.0.4",
 		"random-word-slugs": "^0.1.6"
 	},
@@ -69,10 +69,8 @@
 		]
 	},
 	"volta": {
-		"node": "16.15.0",
-		"yarn": "1.22.10"
-	},
-	"engines": {
-		"node": ">=16.7"
+		"node": "14.16.1",
+		"yarn": "1.22.10",
+		"npm": "7.11.2"
 	}
 }

src/app.html

@@ -11,37 +11,37 @@
 		<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." />
-		<link rel="icon" type="image/png" href="%sveltekit.assets%/favicon.png" />
-		<link rel="manifest" href="%sveltekit.assets%/manifest.json" />
+		<link rel="icon" type="image/png" href="/favicon.png" />
+		<link rel="manifest" href="/manifest.json" />
 		<link
 			rel="stylesheet"
 			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.33.0/min/vs/editor/editor.main.min.css"
+			href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.0/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.33.0/min/vs' }
+				paths: { vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.0/min/vs' }
 			};
 		</script>
 		<script
-			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.33.0/min/vs/loader.min.js"
+			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.0/min/vs/loader.min.js"
 			crossorigin="anonymous"
 			referrerpolicy="no-referrer"></script>
 		<script
-			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.33.0/min/vs/editor/editor.main.nls.min.js"
+			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.0/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.33.0/min/vs/editor/editor.main.js"
+			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.0/min/vs/editor/editor.main.js"
 			crossorigin="anonymous"
 			referrerpolicy="no-referrer"></script>
 
-		%sveltekit.head%
+		%svelte.head%
 	</head>
 	<body>
-		<div id="svelte">%sveltekit.body%</div>
+		<div id="svelte">%svelte.body%</div>
 	</body>
 </html>

src/lib/components/actions.svelte

@@ -160,23 +160,15 @@
 		<button class="action-btn flex-auto" on:click={onDownloadSVG}>
 			<i class="fas fa-download mr-2" /> SVG
 		</button>
-		<a target="_blank" href={iUrl}>
-			<button class="action-btn flex-auto">
-				<i class="fas fa-external-link-alt mr-2" /> PNG
-			</button>
-		</a>
-
-		<a target="_blank" href={svgUrl}>
-			<button class="action-btn flex-auto">
-				<i class="fas fa-external-link-alt mr-2" /> SVG
-			</button>
-		</a>
-
-		<a target="_blank" href={krokiUrl}>
-			<button class="action-btn flex-auto">
-				<i class="fas fa-external-link-alt mr-2" /> Kroki
-			</button>
-		</a>
+		<button class="action-btn flex-auto">
+			<a target="_blank" href={iUrl}><i class="fas fa-external-link-alt mr-2" /> PNG</a>
+		</button>
+		<button class="action-btn flex-auto">
+			<a target="_blank" href={svgUrl}><i class="fas fa-external-link-alt mr-2" /> SVG</a>
+		</button>
+		<button class="action-btn flex-auto">
+			<a target="_blank" href={krokiUrl}><i class="fas fa-external-link-alt mr-2" /> Kroki</a>
+		</button>
 
 		<div class="flex gap-2 items-center">
 			PNG size

src/lib/components/card/tabs.svelte

@@ -26,7 +26,7 @@
 		<ul class="tabs" transition:fade>
 			{#each tabs as tab}
 				<div
-					class="tab tab-lifted {activeTabID === tab.id ? 'tab-active' : 'text-primary-content'}"
+					class="tab tab-lifted text-primary-content {activeTabID === tab.id ? 'tab-active' : ''}"
 					on:click|stopPropagation={() => toggleTabs(tab)}>
 					<i class="mr-1 {tab.icon}" />
 					{tab.title}

src/lib/components/preset.svelte

@@ -79,19 +79,7 @@
     section Go home
       Go downstairs: 5: Me
       Sit down: 3: Me
-      `,
-		'Git Graph': `    gitGraph
-      commit
-      commit
-      branch develop
-      checkout develop
-      commit
-      commit
-      checkout main
-      merge develop
-      commit
-      commit
-`
+      `
 	};
 
 	const loadSampleDiagram = (diagramType: string): void => {

src/lib/types.d.ts

@@ -57,11 +57,4 @@ export interface HistoryEntry {
 	url?: string;
 }
 
-export interface DocConfig {
-	[key: string]: {
-		code: string;
-		config?: string;
-	};
-}
-
 type Loader = (url: string) => Promise<State>;

src/lib/util/state.ts

@@ -103,11 +103,11 @@ export const updateConfig = (config: string, updateEditor: boolean): void => {
 	});
 };
 
-export const setDiagramTheme = (theme: 'dark' | 'default' | 'forest'): void => {
+export const toggleDarkTheme = (dark: boolean): void => {
 	codeStore.update((state) => {
 		const config = JSON.parse(state.mermaid);
-		if (!config.theme || ['dark', 'default', 'forest'].includes(config.theme)) {
-			config.theme = theme;
+		if (!config.theme || ['dark', 'default'].includes(config.theme)) {
+			config.theme = dark ? 'dark' : 'default';
 		}
 
 		return { ...state, mermaid: JSON.stringify(config, null, 2), updateEditor: true };

src/routes/__layout.svelte

@@ -4,7 +4,7 @@
 	import { onMount } from 'svelte';
 	import { loadingStateStore } from '$lib/util/loading';
 	import { setTheme, themeStore } from '$lib/util/theme';
-	import { setDiagramTheme } from '$lib/util/state';
+	import { toggleDarkTheme } from '$lib/util/state';
 
 	// This can be removed once https://github.com/sveltejs/kit/issues/1612 is fixed.
 	// Then move it into src and vite will bundle it automatically.
@@ -31,7 +31,7 @@
 		themeStore.subscribe(({ theme, isDark }) => {
 			if (theme) {
 				document.getElementsByTagName('html')[0].setAttribute('data-theme', theme);
-				setDiagramTheme(isDark ? (theme === 'forest' ? 'forest' : 'dark') : 'default');
+				toggleDarkTheme(isDark);
 			}
 		});
 	});

src/routes/edit.svelte

@@ -12,62 +12,17 @@
 	import { onMount } from 'svelte';
 	import mermaid from 'mermaid';
 	import type monaco from 'monaco-editor';
-	import type { EditorUpdateEvent, State, Tab, DocConfig } from '$lib/types';
+	import type { EditorUpdateEvent, State, Tab } from '$lib/types';
 	import { base } from '$app/paths';
 
 	serializedState; // Weird fix for error > serializedState is not defined. Treeshaking?
-
-	type Modes = 'code' | 'config';
-	type Languages = 'mermaid' | 'json';
-
-	let selectedMode: Modes = 'code';
-	const languageMap: { [key in Modes]: Languages } = {
+	let selectedMode = 'code';
+	const languageMap = {
 		code: 'mermaid',
 		config: 'json'
 	};
-	const docURLBase = 'https://mermaid-js.github.io/mermaid';
-	const docMap: DocConfig = {
-		graph: {
-			code: '/#/flowchart',
-			config: '/#/flowchart?id=configuration'
-		},
-		flowchart: {
-			code: '/#/flowchart',
-			config: '/#/flowchart?id=configuration'
-		},
-		sequenceDiagram: {
-			code: '/#/sequenceDiagram',
-			config: '/#/sequenceDiagram?id=configuration'
-		},
-		classDiagram: {
-			code: '/#/classDiagram',
-			config: '/#/classDiagram?id=configuration'
-		},
-		'stateDiagram-v2': {
-			code: '/#/stateDiagram'
-		},
-		gantt: {
-			code: '/#/gantt',
-			config: '/#/gantt?id=configuration'
-		},
-		pie: {
-			code: '/#/pie'
-		},
-		erDiagram: {
-			code: '/#/entityRelationshipDiagram',
-			config: '/#/entityRelationshipDiagram?id=styling'
-		},
-		journey: {
-			code: '/#/user-journey'
-		},
-		gitGraph: {
-			code: '/#/gitgraph',
-			config: '/#/gitgraph?id=gitgraph-specific-configuration-options'
-		}
-	};
 	let text = '';
-	let docURL = docURLBase;
-	let language: Languages = 'mermaid';
+	let language: 'mermaid' | 'json' = 'mermaid';
 	let errorMarkers: monaco.editor.IMarkerData[] = [];
 	$: language = languageMap[selectedMode];
 	$: {
@@ -82,16 +37,10 @@
 		if (state.updateEditor) {
 			text = selectedMode === 'code' ? state.code : state.mermaid;
 		}
-		const codeTypeMatch = /([\S]+)[\s\n]/.exec(state.code);
-		if (codeTypeMatch && codeTypeMatch.length > 1) {
-			const docKey = codeTypeMatch[1];
-			const docConfig = docMap[docKey] ?? { code: '' };
-			docURL = docURLBase + (docConfig[selectedMode] ?? docConfig.code ?? '');
-		}
 	});
 	const tabSelectHandler = (message: CustomEvent<Tab>) => {
-		selectedMode = message.detail.id === 'code' ? 'code' : 'config';
 		$codeStore.updateEditor = true;
+		selectedMode = message.detail.id;
 	};
 	const tabs: Tab[] = [
 		{
@@ -179,28 +128,24 @@
 			<Card on:select={tabSelectHandler} {tabs} isCloseable={false} title="Mermaid">
 				<div slot="actions">
 					<div class="flex flex-row items-center">
-						<div class="form-control flex-row items-center">
-							<label class="cursor-pointer label" for="autoSync">
-								<span> Auto sync</span>
-								<input
-									type="checkbox"
-									class="toggle {$codeStore.autoSync ? 'btn-secondary' : 'toggle-primary'} ml-1"
-									id="autoSync"
-									bind:checked={$codeStore.autoSync} />
-							</label>
-						</div>
-
 						{#if !$codeStore.autoSync}
 							<button
-								class="btn btn-secondary btn-xs mr-1"
+								class="btn btn-secondary btn-xs"
 								title="Sync Diagram"
 								data-cy="sync"
 								on:click={syncDiagram}><i class="fas fa-sync" /></button>
 						{/if}
 
-						<button class="btn btn-secondary btn-xs" title="View documentation">
-							<a target="_blank" href={docURL} data-cy="docs"><i class="fas fa-book mr-1" />Docs</a>
-						</button>
+						<div class="form-control">
+							<label class="cursor-pointer label" for="autoSync">
+								<input
+									type="checkbox"
+									class="toggle toggle-primary mr-1"
+									id="autoSync"
+									bind:checked={$codeStore.autoSync} />
+								<span> Auto sync</span>
+							</label>
+						</div>
 					</div>
 				</div>
 
@@ -218,9 +163,9 @@
 			<Card title="Diagram" isCloseable={false}>
 				<button
 					slot="actions"
-					class="btn btn-secondary btn-xs"
+					class="btn btn-primary btn-xs shadow-lg"
 					title="View diagram in new page"
-					on:click|stopPropagation={() => viewDiagram()}><i class="far fa-eye mr-1" />View</button>
+					on:click|stopPropagation={() => viewDiagram()}><i class="far fa-eye mr-2" /> View</button>
 
 				<div class="flex-1 overflow-auto">
 					<View />

svelte.config.js

@@ -12,20 +12,17 @@ const config = {
 	],
 	kit: {
 		adapter: adapter({
-			pages: `docs`
+			pages: `docs${process.env['BETA'] ? '/beta' : ''}`
 		}),
 		paths: process.env['DEPLOY']
 			? {
-					base: `/mermaid-live-editor`
+					base: `/mermaid-live-editor${process.env['BETA'] ? '/beta' : ''}`
 			  }
 			: {},
 		trailingSlash: 'ignore',
 		vite: {
 			envPrefix: 'MERMAID_',
 			optimizeDeps: { include: ['mermaid'] }
-		},
-		prerender: {
-			default: true
 		}
 	}
 };

tsconfig.json

@@ -1,11 +1,39 @@
 {
+	"compilerOptions": {
+		"moduleResolution": "node",
+		"module": "es2020",
+		"lib": ["es2020", "ESNext", "DOM.Iterable", "DOM"],
+		"target": "es2019",
+		/**
+			svelte-preprocess cannot figure out whether you have a value or a type, so tell TypeScript
+			to enforce using \`import type\` instead of \`import\` for Types.
+			*/
+		"importsNotUsedAsValues": "error",
+		"isolatedModules": true,
+		"resolveJsonModule": true,
+		/**
+			To have warnings/errors of the Svelte compiler at the correct position,
+			enable source maps by default.
+			*/
+		"sourceMap": true,
+		"esModuleInterop": true,
+		"skipLibCheck": true,
+		"forceConsistentCasingInFileNames": true,
+		"baseUrl": ".",
+		"allowJs": true,
+		"checkJs": true,
+		"paths": {
+			"$lib/*": ["src/lib/*"]
+		}
+	},
 	"include": [
 		"src/**/*.d.ts",
+		"src/**/*.js",
 		"src/**/*.ts",
 		"src/**/*.svelte",
 		"cypress/**/*.ts",
 		"cypress/**/*.js",
-		"static/**/*.js"
-	],
-	"extends": "./.svelte-kit/tsconfig.json"
+		"static/**/*.js",
+		"src/pako.mts"
+	]
 }