Merge branch 'master' into gists

* master: (338 commits)
  Update build image version
  Update dependencies
  Remove test run on push
  Update dependencies
  Fix docker build issue
  Bump typescript from 4.2.4 to 4.3.2
  Bump autoprefixer from 10.2.5 to 10.2.6
  Enable recording
  Bump tailwindcss from 2.1.2 to 2.1.4
  Bump @macfja/svelte-persistent-store from 1.1.0 to 1.1.1
  Bump @typescript-eslint/eslint-plugin from 4.22.1 to 4.26.0
  Bump eslint-plugin-tailwindcss from 1.8.0 to 1.9.1
  Disable lint
  Fix snapshot
  Fix editor
  Touchup
  Bump prettier from 2.2.1 to 2.3.0
  Test
  Delete docs
  Fix snapshot
  ...

.eslintrc.cjs

@@ -0,0 +1,38 @@
+module.exports = {
+ root: true,
+ parser: '@typescript-eslint/parser',
+ extends: [
+ 'eslint:recommended',
+ 'plugin:@typescript-eslint/recommended',
+ // 'plugin:@typescript-eslint/recommended-requiring-type-checking',
+ 'prettier'
+ ],
+ plugins: ['svelte3', 'tailwindcss', '@typescript-eslint'],
+ ignorePatterns: ['docs/*', '*.cjs', '*.md', 'snapshots.js', 'svelte.config.js', 'package.json'],
+ overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
+ settings: {
+ 'svelte3/typescript': () => require('typescript')
+ },
+ parserOptions: {
+ sourceType: 'module',
+ ecmaVersion: 2019,
+ tsconfigRootDir: __dirname,
+ project: ['./tsconfig.json'],
+ extraFileExtensions: ['.svelte']
+ },
+ env: {
+ browser: true,
+ es2017: true,
+ node: true
+ },
+ rules: {
+ '@typescript-eslint/ban-ts-comment': [
+ 'error',
+ {
+ 'ts-ignore': 'allow-with-description'
+ }
+ ],
+ '@typescript-eslint/no-unsafe-member-access': 'warn',
+ '@typescript-eslint/no-unsafe-assignment': 'warn'
+ }
+};

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,41 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Link to Live Editor:
+Steps to reproduce the behavior:
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+
+- Device: [e.g. iPhone6]
+- OS: [e.g. iOS8.1]
+- Browser [e.g. stock browser, safari]
+- Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/codeql/config.yml

@@ -0,0 +1,7 @@
+name: 'Mermaid CodeQL config'
+
+paths:
+ - src
+paths-ignore:
+ - node_modules
+ - '**/*.spec.js'

.github/dependabot.yml

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

pull_request_template.md → .github/pull_request_template.md

@@ -1,13 +1,17 @@
 ## :bookmark_tabs: Summary
+
 Brief description about the content of your PR:
 
 Resolves #<your issue id here>
 
 ## :straight_ruler: Design Decisions
+
 Describe the way your implementation works or what design decisions you made if applicable:
 
 ### :clipboard: Tasks
+
 Make sure you
-- [ ] :book: have read the [contribution guidelines](https://github.com/mermaid-js/mermaid/blob/develop/CONTRIBUTING.md) 
-- [ ] :computer: have added unit/e2e tests (if appropriate) 
-- [ ] :bookmark: targeted `master` branch 
+
+- [ ] :book: have read the [contribution guidelines](https://github.com/mermaid-js/mermaid/blob/master/CONTRIBUTING.md)
+- [ ] :computer: have added unit/e2e tests (if appropriate)
+- [ ] :bookmark: targeted `develop` branch

.github/workflows/codeql-analysis.yml

@@ -9,14 +9,14 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: "CodeQL"
+name: 'CodeQL'
 
 on:
  push:
- branches: [ master ]
+ branches: [master]
  pull_request:
  # The branches below must be a subset of the branches above
- branches: [ master ]
+ branches: [master]
  schedule:
  - cron: '36 1 * * 2'
 
@@ -28,40 +28,41 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- language: [ 'javascript' ]
+ language: ['javascript']
  # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
  # Learn more:
  # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
  steps:
- - name: Checkout repository
- uses: actions/checkout@v2
+  - name: Checkout repository
+  uses: actions/checkout@v2
 
- # Initializes the CodeQL tools for scanning.
- - name: Initialize CodeQL
- uses: github/codeql-action/init@v1
- with:
- languages: ${{ matrix.language }}
- # If you wish to specify custom queries, you can do so here or in a config file.
- # By default, queries listed here will override any specified in a config file.
- # Prefix the list here with "+" to use these queries and those in the config file.
- # queries: ./path/to/local/query, your-org/your-repo/queries@main
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v1
+ with:
+ config-file: ./.github/codeql/config.yml
+ languages: ${{ matrix.language }}
+ # If you wish to specify custom queries, you can do so here or in a config file.
+ # By default, queries listed here will override any specified in a config file.
+ # Prefix the list here with "+" to use these queries and those in the config file.
+ # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
- # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
- # If this step fails, then you should remove it and run the build manually (see below)
- - name: Autobuild
- uses: github/codeql-action/autobuild@v1
+  # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
+  # If this step fails, then you should remove it and run the build manually (see below)
+  # - name: Autobuild
+ # uses: github/codeql-action/autobuild@v1
 
- # ℹ️ Command-line programs to run using the OS shell.
- # 📚 https://git.io/JvXDl
+  # ℹ️ Command-line programs to run using the OS shell.
+  # 📚 https://git.io/JvXDl
 
- # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
- # and modify them (or add more) to build your code if your project
- # uses a compiled language
+  # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+  # and modify them (or add more) to build your code if your project
+  # uses a compiled language
 
- #- run: |
- # make bootstrap
- # make release
+  #- run: |
+  # make bootstrap
+  # make release
 
- - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
+  - name: Perform CodeQL Analysis
+  uses: github/codeql-action/analyze@v1

.github/workflows/cypress.yml

@@ -0,0 +1,41 @@
+name: Cypress Tests
+
+on:
+ pull_request:
+ branches:
+ - master
+ - develop
+
+jobs:
+ cypress-run:
+ runs-on: ubuntu-latest
+ container: cypress/browsers:node14.16.0-chrome90-ff88
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+
+ - uses: actions/cache@v2
+ id: yarn-and-build-cache
+ with:
+ path: |
+ ~/.cache/Cypress
+ build
+ node_modules
+ key: ${{ runner.os }}-node_modules-build-${{ hashFiles('**/yarn.lock') }}
+ restore-keys: |
+ ${{ runner.os }}-node_modules-build-
+
+ # Install NPM dependencies, cache them correctly
+ # and run all Cypress tests
+ - name: Cypress run
+ uses: cypress-io/github-action@v2
+ with:
+ build: yarn build
+ start: yarn preview
+ wait-on: 'http:https://localhost:3000'
+ wait-on-timeout: 120
+ record: true
+ headless: true
+ env:
+ CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}

.github/workflows/deploy.yml

@@ -3,24 +3,46 @@ on:
  push:
  branches:
  - master
+ pull_request:
+ branches:
+ - master
 jobs:
  build:
  runs-on: ubuntu-latest
  steps:
  - uses: actions/setup-node@v2
  with:
- node-version: '12'
+ node-version: '14'
 
  - name: Checkout
  uses: actions/checkout@v2
 
+ - uses: actions/cache@v2
+ id: yarn-and-build-cache
+ with:
+ path: |
+ node_modules
+ key: ${{ runner.os }}-node_modules-build-deploy-${{ hashFiles('**/yarn.lock') }}
+ restore-keys: |
+ ${{ runner.os }}-node_modules-build-deploy-
+
  - 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 release
- git config user.name github-actions
- git config user.email [email protected]
- git add ./docs/*
- git commit -m "Release"
- git push
+ # yarn run lint
+ version=$(yarn version --patch --no-git-tag-version | grep "New version" | cut -d':' -f 2)
+ yarn build
+ cd bin
+ ./fix-path
+ cd ..
+
+ - name: Deploy
+ uses: peaceiris/actions-gh-pages@v3
+ with:
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ publish_dir: ./docs
+ keep_files: true

.github/workflows/stale.yml

@@ -2,17 +2,16 @@ name: Mark stale issues and pull requests
 
 on:
  schedule:
- - cron: "0 0 * * *"
+  - cron: '0 0 * * 4'
 
 jobs:
  stale:
-
  runs-on: ubuntu-latest
-
  steps:
- - uses: actions/stale@v3
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
- 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' 
-
+ - uses: actions/stale@v3
+ 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 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'

.gitignore

@@ -4,3 +4,10 @@ coverage/
 build/
 yarn-error.log
 .npmrc
+.DS_Store
+/.svelte-kit
+/build
+/functions
+/snapshots.js
+/cypress/videos
+/cypress/screenshots

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run pre-commit

.npmrc

@@ -0,0 +1 @@
+engine-strict=true

.prettierignore

@@ -1 +1,6 @@
-docs
+docs/**
+.svelte-kit/**
+static/**
+build/**
+node_modules/**
+snapshots.js

.prettierrc

@@ -1,3 +1,8 @@
 {
- "singleQuote": true
-}
+ "singleQuote": true,
+ "svelteSortOrder": "options-scripts-markup-styles",
+ "svelteBracketNewLine": false,
+ "useTabs": true,
+ "trailingComma": "none",
+ "printWidth": 100
+}