Skip to content

Commit baafaf0

Browse files
authored
Merge branch 'develop' into multi-line-er-label
2 parents 731b330 + 5ba5e30 commit baafaf0

File tree

145 files changed

+6540
-5886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+6540
-5886
lines changed

.changeset/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Changesets
2+
3+
Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
4+
with multi-package repos, or single-package repos to help you version and publish your code. You can
5+
find the full documentation for it [in our repository](https://github.com/changesets/changesets)
6+
7+
We have a quick list of common questions to get you started engaging with this project in
8+
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.changeset/config.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
3+
"changelog": ["@changesets/changelog-github", { "repo": "mermaid-js/mermaid" }],
4+
"commit": false,
5+
"fixed": [],
6+
"linked": [],
7+
"access": "public",
8+
"baseBranch": "master",
9+
"updateInternalDependencies": "patch",
10+
"bumpVersionsWithWorkspaceProtocolOnly": true,
11+
"ignore": ["@mermaid-js/docs", "@mermaid-js/webpack-test", "@mermaid-js/mermaid-example-diagram"]
12+
}

.cspell/code-terms.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ SUBROUTINEEND
120120
SUBROUTINESTART
121121
Subschemas
122122
substr
123+
SVGG
124+
SVGSVG
123125
TAGEND
124126
TAGSTART
125127
techn

.cspell/libraries.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ rehype
5858
roughjs
5959
rscratch
6060
shiki
61+
Slidev
6162
sparkline
6263
sphinxcontrib
6364
ssim

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ Make sure you
1515
- [ ] :book: have read the [contribution guidelines](https://mermaid.js.org/community/contributing.html)
1616
- [ ] :computer: have added necessary unit/e2e tests.
1717
- [ ] :notebook: have added documentation. Make sure [`MERMAID_RELEASE_VERSION`](https://mermaid.js.org/community/contributing.html#update-documentation) is used for all new features.
18-
- [ ] :bookmark: targeted `develop` branch
18+
- [ ] :butterfly: If your PR makes a change that should be noted in one or more packages' changelogs, generate a changeset by running `pnpm changeset` and following the prompts. Changesets that add features should be `minor` and those that fix bugs should be `patch`. Please prefix changeset messages with `feat:`, `fix:`, or `chore:`.

.github/release-drafter.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

.github/workflows/autofix.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,24 @@ name: autofix.ci # needed to securely identify the workflow
22

33
on:
44
pull_request:
5+
branches-ignore:
6+
- 'renovate/**'
57
permissions:
68
contents: read
79

10+
concurrency: ${{ github.workflow }}-${{ github.ref }}
11+
812
jobs:
913
autofix:
1014
runs-on: ubuntu-latest
1115
steps:
12-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
1317

14-
- uses: pnpm/action-setup@v4
18+
- uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
1519
# uses version from "packageManager" field in package.json
1620

1721
- name: Setup Node.js
18-
uses: actions/setup-node@v4
22+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
1923
with:
2024
cache: pnpm
2125
node-version-file: '.node-version'
@@ -38,4 +42,4 @@ jobs:
3842
working-directory: ./packages/mermaid
3943
run: pnpm run docs:build
4044

41-
- uses: autofix-ci/action@ff86a557419858bb967097bfc916833f5647fa8c
45+
- uses: autofix-ci/action@ff86a557419858bb967097bfc916833f5647fa8c # main

.github/workflows/build-docs.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88
pull_request:
99
merge_group:
1010

11+
concurrency: ${{ github.workflow }}-${{ github.ref }}
12+
1113
permissions:
1214
contents: read
1315

@@ -16,12 +18,12 @@ jobs:
1618
runs-on: ubuntu-latest
1719
steps:
1820
- name: Checkout
19-
uses: actions/checkout@v4
21+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2022

21-
- uses: pnpm/action-setup@v4
23+
- uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
2224

2325
- name: Setup Node.js
24-
uses: actions/setup-node@v4
26+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
2527
with:
2628
cache: pnpm
2729
node-version-file: '.node-version'

.github/workflows/build.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout repository
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2222

2323
- name: Check for difference in README.md and docs/README.md
2424
run: |

.github/workflows/checks.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.github/workflows/codeql.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
- synchronize
1212
- ready_for_review
1313

14+
permissions: # added using https://github.com/step-security/secure-repo
15+
contents: read
16+
1417
jobs:
1518
analyze:
1619
name: Analyze
@@ -29,11 +32,11 @@ jobs:
2932

3033
steps:
3134
- name: Checkout repository
32-
uses: actions/checkout@v4
35+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
3336

3437
# Initializes the CodeQL tools for scanning.
3538
- name: Initialize CodeQL
36-
uses: github/codeql-action/init@v3
39+
uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
3740
with:
3841
config-file: ./.github/codeql/codeql-config.yml
3942
languages: ${{ matrix.language }}
@@ -45,7 +48,7 @@ jobs:
4548
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4649
# If this step fails, then you should remove it and run the build manually (see below)
4750
- name: Autobuild
48-
uses: github/codeql-action/autobuild@v3
51+
uses: github/codeql-action/autobuild@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
4952

5053
# ℹ️ Command-line programs to run using the OS shell.
5154
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -59,4 +62,4 @@ jobs:
5962
# make release
6063

6164
- name: Perform CodeQL Analysis
62-
uses: github/codeql-action/analyze@v3
65+
uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5

.github/workflows/dependency-review.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: 'Checkout Repository'
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
1919
- name: 'Dependency Review'
20-
uses: actions/dependency-review-action@v4
20+
uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4

.github/workflows/e2e-applitools.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ on:
1111
default: master
1212
description: 'Parent branch to use for PRs'
1313

14+
concurrency: ${{ github.workflow }}-${{ github.ref }}
15+
1416
permissions:
1517
contents: read
1618

@@ -30,13 +32,13 @@ jobs:
3032
run: |
3133
echo "::error,title=Not using Applitools::APPLITOOLS_API_KEY is empty, disabling Applitools for this run."
3234
33-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
3436

35-
- uses: pnpm/action-setup@v4
37+
- uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
3638
# uses version from "packageManager" field in package.json
3739

3840
- name: Setup Node.js
39-
uses: actions/setup-node@v4
41+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
4042
with:
4143
node-version-file: '.node-version'
4244

@@ -52,7 +54,7 @@ jobs:
5254
APPLITOOLS_SERVER_URL: 'https://eyesapi.applitools.com'
5355

5456
- name: Cypress run
55-
uses: cypress-io/github-action@v4
57+
uses: cypress-io/github-action@d79d2d530a66e641eb4a5f227e13bc985c60b964 # v4.2.2
5658
id: cypress
5759
with:
5860
start: pnpm run dev

0 commit comments

Comments
 (0)