Skip to content

Commit 17189ce

Browse files
authored
Merge branch 'develop' into fix-markdown-labels-6087
2 parents 70c9e6e + f28f3c2 commit 17189ce

32 files changed

+308
-167
lines changed

.changeset/chilly-words-march.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: Correct viewBox casing and make SVGs responsive

.changeset/deep-pumas-run.md

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

.changeset/four-eyes-wish.md

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

.changeset/moody-fans-try.md

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

.changeset/proud-colts-smell.md

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

.changeset/revert-marked-dependency.md

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

.changeset/short-seals-sort.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: allow to put notes in namespaces on classDiagram

.github/workflows/validate-lockfile.yml

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Validate pnpm-lock.yaml
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
paths:
66
- 'pnpm-lock.yaml'
77
- '**/package.json'
@@ -15,6 +15,8 @@ jobs:
1515
uses: actions/checkout@v4
1616
with:
1717
fetch-depth: 0
18+
ref: ${{ github.event.pull_request.head.sha }}
19+
repository: ${{ github.event.pull_request.head.repo.full_name }}
1820

1921
- name: Set up Node.js
2022
uses: actions/setup-node@v4
@@ -55,16 +57,41 @@ jobs:
5557
exit 1
5658
fi
5759
60+
- name: Find existing lockfile validation comment
61+
if: always()
62+
uses: peter-evans/find-comment@v3
63+
id: find-comment
64+
with:
65+
issue-number: ${{ github.event.pull_request.number }}
66+
comment-author: 'github-actions[bot]'
67+
body-includes: 'Lockfile Validation Failed'
68+
5869
- name: Comment on PR if validation failed
5970
if: failure()
60-
uses: peter-evans/create-or-update-comment@v4
71+
uses: peter-evans/create-or-update-comment@v5
6172
with:
6273
token: ${{ secrets.GITHUB_TOKEN }}
6374
issue-number: ${{ github.event.pull_request.number }}
75+
comment-id: ${{ steps.find-comment.outputs.comment-id }}
76+
edit-mode: replace
6477
body: |
78+
❌ **Lockfile Validation Failed**
79+
6580
The following issue(s) were detected:
6681
${{ steps.validate.outputs.errors }}
6782
6883
Please address these and push an update.
6984
7085
_Posted automatically by GitHub Actions_
86+
87+
- name: Delete comment if validation passed
88+
if: success() && steps.find-comment.outputs.comment-id != ''
89+
uses: actions/github-script@v7
90+
with:
91+
github-token: ${{ secrets.GITHUB_TOKEN }}
92+
script: |
93+
await github.rest.issues.deleteComment({
94+
owner: context.repo.owner,
95+
repo: context.repo.repo,
96+
comment_id: ${{ steps.find-comment.outputs.comment-id }},
97+
});

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ USER 0:0
55
RUN corepack enable \
66
&& corepack enable pnpm
77

8-
RUN apk add --no-cache git~=2.43.4 \
8+
RUN apk add --no-cache git~=2.43 \
99
&& git config --add --system safe.directory /mermaid
1010

1111
ENV NODE_OPTIONS="--max_old_space_size=8192"

cypress/helpers/util.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ export const openURLAndVerifyRendering = (
9999
cy.visit(url);
100100
cy.window().should('have.property', 'rendered', true);
101101
cy.get('svg').should('be.visible');
102+
cy.get('svg').should('not.have.attr', 'viewbox');
102103

103104
if (validation) {
104105
cy.get('svg').should(validation);

0 commit comments

Comments
 (0)