Skip to content

Commit 37e3a69

Browse files
authored
Merge pull request #6956 from mermaid-js/develop
Pre Release
2 parents e87f77a + 0de0b06 commit 37e3a69

Some content is hidden

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

62 files changed

+6101
-6658
lines changed

.changeset/four-eyes-wish.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
fix: Ensure edge label color is applied when using classDef with edge IDs

.changeset/moody-fans-try.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
fix: Resolve gantt chart crash due to invalid array length

.changeset/proud-colts-smell.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': minor
3+
---
4+
5+
feat: Add IDs in architecture diagrams
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
chore: revert marked dependency from ^15.0.7 to ^16.0.0
6+
7+
- Reverted marked package version to ^16.0.0 for better compatibility
8+
- This is a dependency update that maintains API compatibility
9+
- All tests pass with the updated version

.cspell/mermaid-terms.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ compositTitleSize
88
cose
99
curv
1010
doublecircle
11+
elem
1112
elems
1213
gantt
1314
gitgraph

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
# Initializes the CodeQL tools for scanning.
3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
39+
uses: github/codeql-action/init@5378192d256ef1302a6980fffe5ca04426d43091 # v3.28.21
4040
with:
4141
config-file: ./.github/codeql/codeql-config.yml
4242
languages: ${{ matrix.language }}
@@ -48,7 +48,7 @@ jobs:
4848
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4949
# If this step fails, then you should remove it and run the build manually (see below)
5050
- name: Autobuild
51-
uses: github/codeql-action/autobuild@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
51+
uses: github/codeql-action/autobuild@5378192d256ef1302a6980fffe5ca04426d43091 # v3.28.21
5252

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

6464
- name: Perform CodeQL Analysis
65-
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
65+
uses: github/codeql-action/analyze@5378192d256ef1302a6980fffe5ca04426d43091 # v3.28.21

.github/workflows/e2e-applitools.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
args: -X POST "$APPLITOOLS_SERVER_URL/api/externals/github/push?apiKey=$APPLITOOLS_API_KEY&CommitSha=$GITHUB_SHA&BranchName=${APPLITOOLS_BRANCH}$&ParentBranchName=$APPLITOOLS_PARENT_BRANCH"
5454

5555
- name: Cypress run
56-
uses: cypress-io/github-action@18a6541367f4580a515371905f499a27a44e8dbe # v6.7.12
56+
uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f # v6.7.16
5757
id: cypress
5858
with:
5959
start: pnpm run dev

.github/workflows/e2e-timings.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
with:
2828
node-version-file: '.node-version'
2929
- name: Install dependencies
30-
uses: cypress-io/github-action@18a6541367f4580a515371905f499a27a44e8dbe # v6.7.12
30+
uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f # v6.7.16
3131
with:
3232
runTests: false
3333

3434
- name: Cypress run
35-
uses: cypress-io/github-action@18a6541367f4580a515371905f499a27a44e8dbe # v6.7.12
35+
uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f # v6.7.16
3636
id: cypress
3737
with:
3838
install: false
@@ -58,7 +58,7 @@ jobs:
5858
echo "EOF" >> $GITHUB_OUTPUT
5959
6060
- name: Commit and create pull request
61-
uses: peter-evans/create-pull-request@18e469570b1cf0dfc11d60ec121099f8ff3e617a
61+
uses: peter-evans/create-pull-request@915d841dae6a4f191bb78faf61a257411d7be4d2
6262
with:
6363
add-paths: |
6464
cypress/timings.json

.github/workflows/e2e.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
node-version-file: '.node-version'
4646
- name: Cache snapshots
4747
id: cache-snapshot
48-
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
48+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
4949
with:
5050
path: ./cypress/snapshots
5151
key: ${{ runner.os }}-snapshots-${{ env.targetHash }}
@@ -59,7 +59,7 @@ jobs:
5959

6060
- name: Install dependencies
6161
if: ${{ steps.cache-snapshot.outputs.cache-hit != 'true' }}
62-
uses: cypress-io/github-action@18a6541367f4580a515371905f499a27a44e8dbe # v6.7.12
62+
uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f # v6.7.16
6363
with:
6464
# just perform install
6565
runTests: false
@@ -95,13 +95,13 @@ jobs:
9595
# These cached snapshots are downloaded, providing the reference snapshots.
9696
- name: Cache snapshots
9797
id: cache-snapshot
98-
uses: actions/cache/restore@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
98+
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
9999
with:
100100
path: ./cypress/snapshots
101101
key: ${{ runner.os }}-snapshots-${{ env.targetHash }}
102102

103103
- name: Install dependencies
104-
uses: cypress-io/github-action@18a6541367f4580a515371905f499a27a44e8dbe # v6.7.12
104+
uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f # v6.7.16
105105
with:
106106
runTests: false
107107

@@ -117,7 +117,7 @@ jobs:
117117
# Install NPM dependencies, cache them correctly
118118
# and run all Cypress tests
119119
- name: Cypress run
120-
uses: cypress-io/github-action@18a6541367f4580a515371905f499a27a44e8dbe # v6.7.12
120+
uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f # v6.7.16
121121
id: cypress
122122
with:
123123
install: false

.github/workflows/link-checker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3333

3434
- name: Restore lychee cache
35-
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
35+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
3636
with:
3737
path: .lycheecache
3838
key: cache-lychee-${{ github.sha }}

0 commit comments

Comments
 (0)