Skip to content

chore: fix bad merge commit for v11.14.0 - #7715

Merged
aloisklink merged 2 commits into
mermaid-js:release/11.15.0from
aloisklink:refactor/fix-bad-v11.14.0-merge
May 7, 2026
Merged

aloisklink merged 2 commits into
mermaid-js:release/11.15.0from
aloisklink:refactor/fix-bad-v11.14.0-merge

Conversation

@aloisklink

@aloisklink aloisklink commented May 6, 2026 •

Copy link
Copy Markdown
Member

📑 Summary

Note

This PR targets the release/11.15.0 instead of develop.

701020c was a bad merge, which didn't correctly cleanup the changeset entries that we released as part of v11.14.0.

📏 Design Decisions

N/A

📋 Tasks

Make sure you

  • 📖 have read the contribution guidelines
  • 💻 have added necessary unit/e2e tests.
    • No tests needed.
  • 📓 have added documentation. Make sure MERMAID_RELEASE_VERSION is used for all new features.
    • No documentation needed.
  • 🦋 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:.

701020c (Merge branch 'master' into develop, 2026-04-01) was a bad
merge, which didn't correctly cleanup the changeset entries.

Fixes: 701020c
@netlify

netlify Bot commented May 6, 2026 •

Copy link
Copy Markdown

✅ Deploy Preview for mermaid-js ready!

Name Link
🔨 Latest commit 1bc37bd
🔍 Latest deploy log https://app.netlify.com/projects/mermaid-js/deploys/69fc5d42cf549f0008199194
😎 Deploy Preview https://deploy-preview-7715--mermaid-js.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.
🤖 Make changes Run an agent on this branch

To edit notification comments on pull requests, go to your Netlify project configuration.

@changeset-bot

changeset-bot Bot commented May 6, 2026 •

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 1bc37bd

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@github-actions github-actions Bot added the Type: Other Not an enhancement or a bug label May 6, 2026
@codecov

codecov Bot commented May 6, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 3.30%. Comparing base (84abc58) to head (1bc37bd).
⚠️ Report is 8 commits behind head on release/11.15.0.

Additional details and impacted files

Impacted file tree graph

@@                Coverage Diff                 @@
##           release/11.15.0   #7715      +/-   ##
==================================================
- Coverage             3.33%   3.30%   -0.04%     
==================================================
  Files                  542     561      +19     
  Lines                56881   58355    +1474     
  Branches               839     873      +34     
==================================================
+ Hits                  1899    1928      +29     
- Misses               54982   56427    +1445     
Flag Coverage Δ
unit 3.30% <ø> (-0.04%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.
see 40 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Conflicts:
 - `.changeset/add-wardley-maps.md`
   (deleted, due to already being released in v11.14.0)
@aloisklink
aloisklink force-pushed the refactor/fix-bad-v11.14.0-merge branch from e10f334 to 1bc37bd Compare May 7, 2026 09:37
@aloisklink
aloisklink changed the base branch from develop to release/11.15.0 May 7, 2026 09:37
@pkg-pr-new

pkg-pr-new Bot commented May 7, 2026

Copy link
Copy Markdown

Open in StackBlitz

@mermaid-js/examples

npm i https://pkg.pr.new/@mermaid-js/examples@7715

mermaid

npm i https://pkg.pr.new/mermaid@7715

@mermaid-js/layout-elk

npm i https://pkg.pr.new/@mermaid-js/layout-elk@7715

@mermaid-js/layout-tidy-tree

npm i https://pkg.pr.new/@mermaid-js/layout-tidy-tree@7715

@mermaid-js/mermaid-zenuml

npm i https://pkg.pr.new/@mermaid-js/mermaid-zenuml@7715

@mermaid-js/parser

npm i https://pkg.pr.new/@mermaid-js/parser@7715

@mermaid-js/tiny

npm i https://pkg.pr.new/@mermaid-js/tiny@7715

commit: 1bc37bd

@ashishjain0512 ashishjain0512 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aloisklink Thank you for the clean up 👍

@aloisklink
aloisklink merged commit 270c80b into mermaid-js:release/11.15.0 May 7, 2026
19 checks passed
@aloisklink
aloisklink deleted the refactor/fix-bad-v11.14.0-merge branch May 7, 2026 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: DevOps Type: Other Not an enhancement or a bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants