Merge branch 'develop' into pr/iwestlin/4288

* develop: (596 commits)
  chore(deps): update all minor dependencies
  chore(deps): update all patch dependencies
  fix: flowchart image without text
  fix Types
  chore: Update pnpm-lock
  chore: Add tests for calculateDeltaAndAngle
  fix: mermaid-js#5064 Handle case when line has only one point
  reset the testTimeout to 5 seconds and change it directly in the test
  update testTimeout from 5 seconds to 10 seconds
  Update all patch dependencies
  fix broken link
  add latest blog post
  Update all minor dependencies
  Update all patch dependencies
  Fix docs
  Update packages/mermaid/src/docs/community/questions-and-suggestions.md
  Update packages/mermaid/src/diagrams/class/classRenderer-v2.ts
  update edge ids
  draw top actors with lines  first followed by messages
  Bump GitHub workflow actions to latest versions
  ...

.eslintrc.cjs

@@ -48,8 +48,11 @@ module.exports = {
  'no-prototype-builtins': 'off',
  'no-unused-vars': 'off',
  'cypress/no-async-tests': 'off',
+ '@typescript-eslint/consistent-type-imports': 'error',
+ '@typescript-eslint/no-explicit-any': 'warn',
  '@typescript-eslint/no-floating-promises': 'error',
  '@typescript-eslint/no-misused-promises': 'error',
+ '@typescript-eslint/no-unused-vars': 'warn',
  '@typescript-eslint/ban-ts-comment': [
  'error',
  {

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -17,6 +17,9 @@ body:
  - Use a clear and concise title
  - Fill out the text fields with as much detail as possible.
  - Never be shy to give us screenshots and/or code samples. It will help!
+
+ There is a chance that the bug is already fixed in the git `develop` branch, but is not released yet. 
+ So please check in [Live Editor - Develop](https://develop.git.mermaid.live) before raising an issue.
  - type: textarea
  attributes:
  label: Description
@@ -43,7 +46,7 @@ body:
  attributes:
  label: Code Sample
  description: |-
- If applicable, add the code sample or a link to the [Live Editor](https://mermaid.live).
+ If applicable, add the code sample or a link to the [Live Editor - Develop](https://develop.git.mermaid.live).
  Any text pasted here will be rendered as a Code block.
  render: text
  - type: textarea

.github/ISSUE_TEMPLATE/config.yml

@@ -7,8 +7,14 @@ contact_links:
  url: https://join.slack.com/t/mermaid-talk/shared_invite/enQtNzc4NDIyNzk4OTAyLWVhYjQxOTI2OTg4YmE1ZmJkY2Y4MTU3ODliYmIwOTY3NDJlYjA0YjIyZTdkMDMyZTUwOGI0NjEzYmEwODcwOTE
  about: Join our Community on Slack for Help and a casual chat.
  - name: Documentation
- url: https://mermaid-js.github.io
+ url: https://mermaid.js.org
  about: Read our documentation for all that Mermaid.js can offer.
  - name: Live Editor
  url: https://mermaid.live
  about: Try the live editor to preview graphs in no time.
+ - name: Live Editor - Develop
+ url: https://develop.git.mermaid.live
+ about: Try unreleased changes in the develop branch.
+ - name: Live Editor - Next
+ url: https://next.git.mermaid.live
+ about: Try unreleased changes in the next branch.

.github/lychee.toml

@@ -0,0 +1,44 @@
+############################# Display #############################
+
+# Verbose program output
+# Accepts log level: "error", "warn", "info", "debug", "trace"
+verbose = "debug"
+
+# Don't show interactive progress bar while checking links.
+no_progress = true
+
+############################# Cache ###############################
+
+# Enable link caching. This can be helpful to avoid checking the same links on
+# multiple runs.
+cache = true
+
+# Discard all cached requests older than this duration.
+max_cache_age = "1d"
+
+############################# Requests ############################
+
+# Comma-separated list of accepted status codes for valid links.
+accept = [200, 429]
+
+############################# Exclusions ##########################
+
+# Exclude URLs and mail addresses from checking (supports regex).
+exclude = [
+# Network error: Forbidden
+"https://codepen.io",
+
+# Timeout error, maybe Twitter has anti-bot defenses against GitHub's CI servers?
+"https://twitter.com/mermaidjs_",
+
+# Don't check files that are generated during the build via `pnpm docs:code`
+'packages/mermaid/src/docs/config/setup/*',
+
+# Ignore slack invite
+"https://join.slack.com/"
+]
+
+# Exclude all private IPs from checking.
+# Equivalent to setting `exclude_private`, `exclude_link_local`, and
+# `exclude_loopback` to true.
+exclude_all_private = true

.github/pr-labeler.yml

@@ -1,4 +1,22 @@
-'Type: Bug / Error': ['bug/*', fix/*]
-'Type: Enhancement': ['feature/*', 'feat/*']
-'Type: Other': ['other/*', 'chore/*', 'test/*', 'refactor/*']
-'Area: Documentation': ['docs/*']
+# yaml-language-server: $schema=https://raw.githubusercontent.com/release-drafter/release-drafter/master/schema.json
+autolabeler:
+ - label: 'Type: Bug / Error'
+ branch:
+ - '/bug\/.+/'
+ - '/fix\/.+/'
+ - label: 'Type: Enhancement'
+ branch:
+ - '/feature\/.+/'
+ - '/feat\/.+/'
+ - label: 'Type: Other'
+ branch:
+ - '/other\/.+/'
+ - '/chore\/.+/'
+ - '/test\/.+/'
+ - '/refactor\/.+/'
+ - label: 'Area: Documentation'
+ branch:
+ - '/docs\/.+/'
+
+template: |
+ This field is unused, as we only use this config file for labeling PRs.

.github/release-drafter.yml

@@ -1,19 +1,30 @@
 name-template: '$NEXT_PATCH_VERSION'
 tag-template: '$NEXT_PATCH_VERSION'
 categories:
+ - title: '🚨 **Breaking Changes**'
+ labels:
+ - 'Breaking Change'
  - title: '🚀 Features'
  labels:
  - 'Type: Enhancement'
+ - 'feature' # deprecated, new PRs shouldn't have this
  - title: '🐛 Bug Fixes'
  labels:
  - 'Type: Bug / Error'
+ - 'fix' # deprecated, new PRs shouldn't have this
  - title: '🧰 Maintenance'
- label: 'Type: Other'
+ labels:
+ - 'Type: Other'
+ - 'chore' # deprecated, new PRs shouldn't have this
+ - title: '⚡️ Performance'
+ labels:
+ - 'Type: Performance'
+ - title: '📚 Documentation'
+ labels:
+ - 'Area: Documentation'
 change-template: '- $TITLE (#$NUMBER) @$AUTHOR'
 sort-by: title
 sort-direction: ascending
-branches:
- - develop
 exclude-labels:
  - 'Skip changelog'
 no-changes-template: 'This release contains minor changes and bugfixes.'

.github/workflows/build-docs.yml

@@ -16,20 +16,20 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - uses: pnpm/action-setup@v2
 
  - name: Setup Node.js
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
  with:
  cache: pnpm
  node-version: 18
 
  - name: Install Packages
  run: pnpm install --frozen-lockfile
 
- - name: Verify release verion
+ - name: Verify release version
  if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release')) }}
  run: pnpm --filter mermaid run docs:verify-version
 

.github/workflows/build.yml

@@ -19,13 +19,13 @@ jobs:
  matrix:
  node-version: [18.x]
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - uses: pnpm/action-setup@v2
  # uses version from "packageManager" field in package.json
 
  - name: Setup Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
  with:
  cache: pnpm
  node-version: ${{ matrix.node-version }}

.github/workflows/check-readme-in-sync.yml

@@ -18,7 +18,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Check for difference in README.md and docs/README.md
  run: |

.github/workflows/checks.yml

@@ -15,7 +15,7 @@ jobs:
  name: check tests
  if: github.repository_owner == 'mermaid-js'
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  fetch-depth: 0
  - uses: testomatio/check-tests@stable

.github/workflows/codeql.yml

@@ -29,7 +29,7 @@ jobs:
 
  steps:
  - name: Checkout repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL

.github/workflows/dependency-review.yml

@@ -1,6 +1,6 @@
 # Dependency Review Action
 #
-# This Action will scan dependency manifest files that change as part of a Pull Reqest, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
+# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
 #
 # Source repository: https://github.com/actions/dependency-review-action
 # Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
@@ -15,6 +15,6 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: 'Checkout Repository'
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: 'Dependency Review'
  uses: actions/dependency-review-action@v3

.github/workflows/e2e-applitools.yml

@@ -30,13 +30,13 @@ jobs:
  run: |
  echo "::error,title=Not using Applitols::APPLITOOLS_API_KEY is empty, disabling Applitools for this run."
 
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - uses: pnpm/action-setup@v2
  # uses version from "packageManager" field in package.json
 
  - name: Setup Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
  with:
  node-version: ${{ matrix.node-version }}
 

.github/workflows/e2e.yml

@@ -17,13 +17,13 @@ jobs:
  node-version: [18.x]
  containers: [1, 2, 3, 4]
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - uses: pnpm/action-setup@v2
  # uses version from "packageManager" field in package.json
 
  - name: Setup Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
  with:
  node-version: ${{ matrix.node-version }}
 

.github/workflows/link-checker.yml

@@ -20,13 +20,13 @@ on:
  - cron: '30 8 * * *'
 
 jobs:
- linkChecker:
+ link-checker:
  runs-on: ubuntu-latest
  permissions:
  # lychee only uses the GITHUB_TOKEN to avoid rate-limiting
  contents: read
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: Restore lychee cache
  uses: actions/cache@v3
@@ -39,10 +39,7 @@ jobs:
  uses: lycheeverse/lychee-action@v1.8.0
  with:
  args: >-
- --verbose
- --no-progress
- --cache
- --max-cache-age 1d
+ --config .github/lychee.toml
  packages/mermaid/src/docs/**/*.md
  README.md
  README.zh-CN.md

.github/workflows/lint.yml

@@ -20,13 +20,13 @@ jobs:
  matrix:
  node-version: [18.x]
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - uses: pnpm/action-setup@v2
  # uses version from "packageManager" field in package.json
 
  - name: Setup Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
  with:
  cache: pnpm
  node-version: ${{ matrix.node-version }}
@@ -62,8 +62,22 @@ jobs:
  ERROR_MESSAGE+=' `pnpm run --filter mermaid types:build-config`'
  ERROR_MESSAGE+=' on your local machine.'
  echo "::error title=Lint failure::${ERROR_MESSAGE}"
- # make sure to return an error exitcode so that GitHub actions shows a red-cross
- exit 1
+ # make sure to return an error exitcode so that GitHub actions shows a red-cross
+ exit 1
+ fi
+
+ - name: Verify no circular dependencies
+ working-directory: ./packages/mermaid
+ shell: bash
+ run: |
+ if ! pnpm run --filter mermaid checkCircle; then
+ ERROR_MESSAGE='Circular dependency detected.'
+ ERROR_MESSAGE+=' This should be fixed by removing the circular dependency.'
+ ERROR_MESSAGE+=' Run `pnpm run --filter mermaid checkCircle` on your local machine'
+ ERROR_MESSAGE+=' to see the circular dependency.'
+ echo "::error title=Lint failure::${ERROR_MESSAGE}"
+ # make sure to return an error exitcode so that GitHub actions shows a red-cross
+ exit 1
  fi
 
  - name: Verify Docs

.github/workflows/pr-labeler.yml

@@ -1,13 +1,31 @@
 name: Apply labels to PR
 on:
  pull_request_target:
- types: [opened]
+ # required for pr-labeler to support PRs from forks
+ # ===================== ⛔ ☢️ 🚫 ⚠️ Warning ⚠️ 🚫 ☢️ ⛔ =======================
+ # Be very careful what you put in this GitHub Action workflow file to avoid
+ # malicious PRs from getting access to the Mermaid-js repo.
+ #
+ # Please read the following first before reviewing/merging:
+ # - https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target
+ # - https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
+ types: [opened, reopened, synchronize]
+
+permissions:
+ contents: read
 
 jobs:
  pr-labeler:
  runs-on: ubuntu-latest
+ permissions:
+ contents: read # read permission is required to read config file
+ pull-requests: write # write permission is required to label PRs
  steps:
  - name: Label PR
- uses: TimonVS/pr-labeler-action@v4
+ uses: release-drafter/release-drafter@v5
+ with:
+ config-name: pr-labeler.yml
+ disable-autolabeler: false
+ disable-releaser: true
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}