diff --git a/.changeset/brave-baths-behave.md b/.changeset/brave-baths-behave.md deleted file mode 100644 index b688a1faf67..00000000000 --- a/.changeset/brave-baths-behave.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: Prevent HTML tags from being escaped in sandbox label rendering diff --git a/.changeset/brave-memes-flash.md b/.changeset/brave-memes-flash.md deleted file mode 100644 index 720cd7202ad..00000000000 --- a/.changeset/brave-memes-flash.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: Support edge animation in hand drawn look diff --git a/.changeset/busy-mirrors-try.md b/.changeset/busy-mirrors-try.md deleted file mode 100644 index 7e5d3b632ee..00000000000 --- a/.changeset/busy-mirrors-try.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: Resolved parsing error where direction TD was not recognized within subgraphs diff --git a/.changeset/chatty-insects-dream.md b/.changeset/chatty-insects-dream.md deleted file mode 100644 index a35ed57860c..00000000000 --- a/.changeset/chatty-insects-dream.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix(treemap): Fixed treemap classDef style application to properly apply user-defined styles diff --git a/.changeset/chilly-words-march.md b/.changeset/chilly-words-march.md deleted file mode 100644 index 54c0b4ebfdf..00000000000 --- a/.changeset/chilly-words-march.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: Correct viewBox casing and make SVGs responsive diff --git a/.changeset/curly-apes-prove.md b/.changeset/curly-apes-prove.md deleted file mode 100644 index 2acf3d1a3ac..00000000000 --- a/.changeset/curly-apes-prove.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: Improve participant parsing and prevent recursive loops on invalid syntax diff --git a/.changeset/curvy-cases-battle.md b/.changeset/curvy-cases-battle.md deleted file mode 100644 index e0489c0bfd4..00000000000 --- a/.changeset/curvy-cases-battle.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -'mermaid': patch ---- - -fix: respect `markdownAutoWrap: false` to prevent text auto-wrapping in flowchart markdown labels with `htmlLabels` enabled. - -Markdown labels with `markdownAutoWrap: false, htmlLabels: false` set doesn't work -correctly. diff --git a/.changeset/dry-brooms-fly.md b/.changeset/dry-brooms-fly.md deleted file mode 100644 index ee48089d778..00000000000 --- a/.changeset/dry-brooms-fly.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: architecture diagram lines should now have the correct length diff --git a/.changeset/eight-crabs-sell.md b/.changeset/eight-crabs-sell.md deleted file mode 100644 index 2ef0a3f73e7..00000000000 --- a/.changeset/eight-crabs-sell.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: Support the [`htmlLabels` Mermaid config value](https://mermaid.js.org/config/schema-docs/config.html#htmllabels) whenever possible diff --git a/.changeset/eight-jobs-sing.md b/.changeset/eight-jobs-sing.md deleted file mode 100644 index f6202cb9cce..00000000000 --- a/.changeset/eight-jobs-sing.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': minor ---- - -feat: Export the `AsyncIconLoader`, `SyncIconLoader`, and `IconLoader` types. diff --git a/.changeset/evil-monkeys-hunt.md b/.changeset/evil-monkeys-hunt.md deleted file mode 100644 index c8c6f9e5894..00000000000 --- a/.changeset/evil-monkeys-hunt.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': minor ---- - -feat: Add venn-beta diagram diff --git a/.changeset/fair-swans-allow.md b/.changeset/fair-swans-allow.md deleted file mode 100644 index e02d07e9d49..00000000000 --- a/.changeset/fair-swans-allow.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: Prevent browser hang when using multiline accDescr in XY charts diff --git a/.changeset/fix-block-nested-positioning.md b/.changeset/fix-block-nested-positioning.md deleted file mode 100644 index a61ca658ba9..00000000000 --- a/.changeset/fix-block-nested-positioning.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: correct block positioning when nested blocks span multiple columns diff --git a/.changeset/fix-bt-arc-curves.md b/.changeset/fix-bt-arc-curves.md deleted file mode 100644 index 2eabbc37331..00000000000 --- a/.changeset/fix-bt-arc-curves.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -'mermaid': patch ---- - -fix: correct BT orientation arc sweep flags in gitGraph drawArrow() - -Swapped SVG arc sweep-flag values in the BT (bottom-to-top) orientation branches of `drawArrow()` so curves bend in the correct direction. Affects both rerouting and non-rerouting code paths for merge and non-merge arrows. - -Resolves #6593 diff --git a/.changeset/fix-colon-in-state-transition.md b/.changeset/fix-colon-in-state-transition.md deleted file mode 100644 index dd26c8aae8e..00000000000 --- a/.changeset/fix-colon-in-state-transition.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: allow colons in stateDiagram-v2 transition and state description text diff --git a/.changeset/fix-gantt-dark-done-text.md b/.changeset/fix-gantt-dark-done-text.md deleted file mode 100644 index fd1095386d1..00000000000 --- a/.changeset/fix-gantt-dark-done-text.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: derive taskTextDarkColor from doneTaskBkgColor in dark theme for readable done-task text diff --git a/.changeset/late-bears-chew.md b/.changeset/late-bears-chew.md deleted file mode 100644 index 1caa1c9eac4..00000000000 --- a/.changeset/late-bears-chew.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -revert: restore original hexagon and roundedRect implementations diff --git a/.changeset/lazy-brooms-battle.md b/.changeset/lazy-brooms-battle.md deleted file mode 100644 index 861f518a652..00000000000 --- a/.changeset/lazy-brooms-battle.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -feat: add alias support for new participant syntax of sequence diagrams diff --git a/.changeset/loud-results-melt.md b/.changeset/loud-results-melt.md deleted file mode 100644 index 7005750c624..00000000000 --- a/.changeset/loud-results-melt.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': minor ---- - -feat: Add half-arrowheads (solid & stick) and central connection support diff --git a/.changeset/nine-bugs-drop.md b/.changeset/nine-bugs-drop.md deleted file mode 100644 index 1a01ed5b311..00000000000 --- a/.changeset/nine-bugs-drop.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix(er): recognize '1' cardinality alias before relationship operators diff --git a/.changeset/odd-crabs-bake.md b/.changeset/odd-crabs-bake.md deleted file mode 100644 index 78cee324b95..00000000000 --- a/.changeset/odd-crabs-bake.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@mermaid-js/examples': minor -'mermaid': minor ---- - -feat: Add Ishikawa diagram (ishikawa-beta) diff --git a/.changeset/olive-mails-joke.md b/.changeset/olive-mails-joke.md deleted file mode 100644 index 504ca561290..00000000000 --- a/.changeset/olive-mails-joke.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -'mermaid': patch ---- - -fix: change `createLabel` to call `createText` - -This adds support for KaTeX and FontAwesome icons loaded via iconpacks in some -older labels. There are some small changes in formatting due to standardizing this code. diff --git a/.changeset/orange-clouds-kick.md b/.changeset/orange-clouds-kick.md deleted file mode 100644 index 4a06ba195a2..00000000000 --- a/.changeset/orange-clouds-kick.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: prevent unintended opacity on SVG aws icons containing rect elements diff --git a/.changeset/restore-hexagon-roundedrect.md b/.changeset/restore-hexagon-roundedrect.md deleted file mode 100644 index e79dca713bd..00000000000 --- a/.changeset/restore-hexagon-roundedrect.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -chore: restore original hexagon and roundedRect implementations diff --git a/.changeset/rounded-edge-curves.md b/.changeset/rounded-edge-curves.md deleted file mode 100644 index b9c3d5636de..00000000000 --- a/.changeset/rounded-edge-curves.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -'mermaid': minor ---- - -fix: replace smooth curve edges with rounded right-angle edges - -The default flowchart edge curve changes from `basis` (smooth splines) to `rounded` (right-angle segments with rounded corners). This fixes ELK layout edges that were curving instead of routing at right angles (#7213) and applies consistently across all diagram types using the shared rendering pipeline. - -To restore the previous smooth curve behavior, set `flowchart.curve: 'basis'` in your config. diff --git a/.changeset/salty-seals-guess.md b/.changeset/salty-seals-guess.md deleted file mode 100644 index 9e0eb9be4af..00000000000 --- a/.changeset/salty-seals-guess.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: Ensure correct edge label rendering for ER and requirement diagrams when flowchart htmlLabels are false diff --git a/.changeset/seven-towns-obey.md b/.changeset/seven-towns-obey.md deleted file mode 100644 index e9cef3473ac..00000000000 --- a/.changeset/seven-towns-obey.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': minor ---- - -feat: Deprecate [`flowchart.htmlLabels`](https://mermaid.js.org/config/schema-docs/config-defs-flowchart-diagram-config.html#htmllabels) in favor of [root-level `htmlLabels`](https://mermaid.js.org/config/schema-docs/config.html#htmllabels) in Mermaid config diff --git a/.changeset/shiny-coats-stay.md b/.changeset/shiny-coats-stay.md deleted file mode 100644 index 6bd8f91982e..00000000000 --- a/.changeset/shiny-coats-stay.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -'@mermaid-js/parser': major ---- - -chore: upgrade to Langium v4 - -Upgrade `@mermaid-js/parser` to use Langium v4, -see https://github.com/eclipse-langium/langium/releases/tag/v4.0.0 -for more details. - -The major breaking changes that impact consumers of this package are: - -- Due to various type-related changes, `langium` now requires version `>= 5.8.0` - of TypeScript. -- The generated type names from `ast.ts` have been moved from `` to - `.$type` - ([langium#1942](https://github.com/eclipse-langium/langium/pull/1942)). - -This also removes a transitive dependency on lodash versions that are vulnerable -to CVE-2025-13465, although -[chevrotain doesn't use the affected functions](https://github.com/Chevrotain/chevrotain/blob/21f20cd9754f8d5e85243fd9286d1fff397363ab/packages/website/docs/changes/CHANGELOG.md?plain=1#L5-L8), -so this is only to silence security scanners. diff --git a/.changeset/short-seals-sort.md b/.changeset/short-seals-sort.md deleted file mode 100644 index db8309c7fec..00000000000 --- a/.changeset/short-seals-sort.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': minor ---- - -feat: allow to put notes in namespaces on classDiagram diff --git a/.changeset/slow-bees-mate.md b/.changeset/slow-bees-mate.md deleted file mode 100644 index c8d5a05be47..00000000000 --- a/.changeset/slow-bees-mate.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@mermaid-js/parser': patch ---- - -fix: enhanced parser error messages to include line and column numbers for better debugging experience diff --git a/.changeset/slow-lemons-know.md b/.changeset/slow-lemons-know.md deleted file mode 100644 index 49eb48543f9..00000000000 --- a/.changeset/slow-lemons-know.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@mermaid': patch ---- - -fix: Mindmap breaking in ELK layout diff --git a/.changeset/sweet-games-build.md b/.changeset/sweet-games-build.md deleted file mode 100644 index a71e3de2553..00000000000 --- a/.changeset/sweet-games-build.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix(er-diagram): prevent syntax error when using 'u', numbers, and decimals in node names diff --git a/.changeset/swift-cloths-run.md b/.changeset/swift-cloths-run.md deleted file mode 100644 index 7f4240ecc34..00000000000 --- a/.changeset/swift-cloths-run.md +++ /dev/null @@ -1,29 +0,0 @@ ---- -'mermaid': patch ---- - -fix: Restore proper rendering of plain text flowchart labels without auto line-wrapping - -This fix restores backwards compatibility with Mermaid v10 by ensuring that plain text labels in flowcharts are rendered correctly. In Mermaid v11, all labels were incorrectly being treated as markdown by default, which caused issues with text wrapping, multiline breaks, and backwards compatibility. - -**What changed:** - -- Plain text labels in flowcharts (without markdown syntax) now render as regular text - - For node labels and edge labels, these will line-wrap automatically. Although this isn't backwards compatible with v10, we think this is a minor change and it's worth keeping to avoid too many changes from diagrams created from v11 onwards. - - Plain text labels in other diagrams will continue to not line wrap. -- Plain text labels with `\n` characters now correctly create line breaks -- Plain text that looks like markdown (e.g., "1.", "- x") is no longer misinterpreted - -**If you want markdown formatting:** -You can still use markdown in your flowchart labels by using the proper markdown syntax. Wrap your markdown text with double quotes and backticks: -``node["`_markdown_ **text**`"]`` - -Example: - -````markdown -```mermaid -flowchart TD - plain["Plain text\nwith manual line break"] - markdown["`This is a **markdown** _label_ that wraps and doesn't replace \n with newlines`"] -``` -```` diff --git a/.changeset/ten-plums-bet.md b/.changeset/ten-plums-bet.md deleted file mode 100644 index f00a4109093..00000000000 --- a/.changeset/ten-plums-bet.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: Support ComponentQueue_Ext to prevent parsing error diff --git a/.changeset/tender-guests-unite.md b/.changeset/tender-guests-unite.md deleted file mode 100644 index cdb6165298e..00000000000 --- a/.changeset/tender-guests-unite.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: Allow quoted string labels in architecture-beta diagrams diff --git a/.changeset/tricky-lions-behave.md b/.changeset/tricky-lions-behave.md deleted file mode 100644 index 8853d70f0ad..00000000000 --- a/.changeset/tricky-lions-behave.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: Correct tooltip placement to appear near hovered element diff --git a/.changeset/tricky-rivers-stand.md b/.changeset/tricky-rivers-stand.md deleted file mode 100644 index 8e0757f14a5..00000000000 --- a/.changeset/tricky-rivers-stand.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: validate dates and tick interval to prevent UI freeze/crash in gantt diagramtype diff --git a/.changeset/wide-lines-trade.md b/.changeset/wide-lines-trade.md deleted file mode 100644 index 1df76a81fac..00000000000 --- a/.changeset/wide-lines-trade.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix: Mindmap rendering issue when the number of Level 2 nodes exceeds 11 diff --git a/.changeset/wise-ends-bake.md b/.changeset/wise-ends-bake.md deleted file mode 100644 index 94715b2ca8e..00000000000 --- a/.changeset/wise-ends-bake.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'mermaid': patch ---- - -fix(gitgraph): pass gitGraphConfig to renderer functions for applying directives properly. diff --git a/.github/lychee.toml b/.github/lychee.toml index 06b3aa707ec..c30bc7078d2 100644 --- a/.github/lychee.toml +++ b/.github/lychee.toml @@ -60,7 +60,22 @@ exclude = [ "https://foswiki.org", "https://www.gnu.org", "https://redmine.org", -"https://mermaid-preview.com" +"https://mermaid-preview.com", + +# npmjs.com 403 +"https://(www.)?npmjs.com", + +# dokuwiki.org 402 +"https://(www.)?dokuwiki.org", + +# medium.com 403 +"https://medium.com", + +# appsource.microsoft.com 403 +"https://appsource.microsoft.com", + +# mermaid.ai 403 +"https://mermaid.ai" ] # Exclude all private IPs from checking. diff --git a/cypress/integration/rendering/erDiagram-unified.spec.js b/cypress/integration/rendering/erDiagram-unified.spec.js index 8cecba21dd0..fcdd51aa6f7 100644 --- a/cypress/integration/rendering/erDiagram-unified.spec.js +++ b/cypress/integration/rendering/erDiagram-unified.spec.js @@ -30,6 +30,20 @@ describe('Entity Relationship Diagram Unified', () => { ); }); + it(`${description}should render ER diagram with edge labels centered when htmlLabels is false`, () => { + imgSnapshotTest( + ` + erDiagram + CUSTOMER ||--o{ ORDER : places + ORDER ||--|{ LINE-ITEM : contains + CUSTOMER ||--|{ ADDRESS : "invoiced at" + CUSTOMER ||--|{ ADDRESS : "receives goods at" + ORDER ||--o{ INVOICE : "liable for" + `, + { ...options, htmlLabels: false } + ); + }); + it(`${description}should render an ER diagram with a recursive relationship`, () => { imgSnapshotTest( ` diff --git a/cypress/integration/rendering/flowchart-v2.spec.js b/cypress/integration/rendering/flowchart-v2.spec.js index 45c13d268a8..35be5e98712 100644 --- a/cypress/integration/rendering/flowchart-v2.spec.js +++ b/cypress/integration/rendering/flowchart-v2.spec.js @@ -71,6 +71,17 @@ describe('Flowchart v2', () => { { htmlLabels: false, flowchart: { htmlLabels: false } } ); }); + + it('5a: should render flowchart with edge labels centered when htmlLabels is false', () => { + imgSnapshotTest( + `flowchart TB + A[Start] -->|first| B[Middle] + B -->|second| C[End] + `, + { logLevel: 1, htmlLabels: false } + ); + }); + it('6: should render non-escaped with html labels', () => { imgSnapshotTest( `flowchart TD diff --git a/cypress/integration/rendering/gantt.spec.js b/cypress/integration/rendering/gantt.spec.js index 26198ce72ca..704fb6fdfba 100644 --- a/cypress/integration/rendering/gantt.spec.js +++ b/cypress/integration/rendering/gantt.spec.js @@ -884,4 +884,38 @@ describe('Gantt diagram', () => { { theme: 'dark' } ); }); + it('should render done task inside-text readable in dark mode', () => { + imgSnapshotTest( + ` + gantt + dateFormat YYYY-MM-DD + title Gantt dark mode done-task inside-text readability + + section A section + Done :done, 2014-01-06, 14d + Active :active, 2014-01-20, 14d + + section Critical tasks + Done critical :crit, done, 2014-01-06, 14d + `, + { theme: 'dark' } + ); + }); + it('should render done task outside-text readable in dark mode (regression #7433)', () => { + imgSnapshotTest( + ` + gantt + dateFormat YYYY-MM-DD + title Gantt dark mode done-task outside-text readability + + section A section + A very long label that will not fit inside the short bar :done, 2014-01-06, 1d + Active short bar :active, 2014-01-07, 1d + + section Critical tasks + A very long label that will not fit inside the short bar :crit, done, 2014-01-06, 1d + `, + { theme: 'dark' } + ); + }); }); diff --git a/cypress/platform/ashish2.html b/cypress/platform/ashish2.html index e486e9ddb5b..7bcf93c2096 100644 --- a/cypress/platform/ashish2.html +++ b/cypress/platform/ashish2.html @@ -59,7 +59,7 @@
Security check
  timeline
-        title My day
+        title My day ahead
         section Section with no tasks
         section Go to work at the dog office
           1930 : first step : second step is a long step
diff --git a/docs/config/directives.md b/docs/config/directives.md
index be77b3b0170..1b37a10c08f 100644
--- a/docs/config/directives.md
+++ b/docs/config/directives.md
@@ -253,7 +253,7 @@ The following code snippet changes flowchart config:
 Here we are overriding only the flowchart config, and not the general config, setting `htmlLabels` to `true` and `curve` to `linear`.
 
 > **Warning**
-> **Deprecated:** `flowchart.htmlLabels` has been deprecated from (v\+). Use the global `htmlLabels` configuration instead. For example, instead of `"flowchart": { "htmlLabels": true }`, use `"htmlLabels": true` at the top level.
+> **Deprecated:** `flowchart.htmlLabels` has been deprecated from (v11.12.3+). Use the global `htmlLabels` configuration instead. For example, instead of `"flowchart": { "htmlLabels": true }`, use `"htmlLabels": true` at the top level.
 
 ```mermaid-example
 %%{init: { "flowchart": { "htmlLabels": true, "curve": "linear" } } }%%
diff --git a/docs/ecosystem/integrations-community.md b/docs/ecosystem/integrations-community.md
index ce433dd8550..5e239f04c67 100644
--- a/docs/ecosystem/integrations-community.md
+++ b/docs/ecosystem/integrations-community.md
@@ -219,7 +219,7 @@ Communication tools and platforms
   - [Adding diagrams to your Astro site with MermaidJS and Playwright](https://agramont.net/blog/diagraming-with-mermaidjs-astro/)
 - [Codedoc](https://codedoc.cc/)
   - [codedoc-mermaid-plugin](https://www.npmjs.com/package/codedoc-mermaid-plugin)
-- [Docsy Hugo Theme](https://www.docsy.dev/docs/adding-content/lookandfeel/#diagrams-with-mermaid) ✅
+- [Docsy Hugo Theme](https://www.docsy.dev/docs/content/diagrams-and-formulae/) ✅
 - [Docusaurus](https://docusaurus.io/docs/markdown-features/diagrams) ✅
 - [Gatsby](https://www.gatsbyjs.com/)
   - [gatsby-remark-mermaid](https://github.com/remcohaszing/gatsby-remark-mermaid)
diff --git a/docs/syntax/ishikawa.md b/docs/syntax/ishikawa.md
index 778d73d3525..d5bbf576b6d 100644
--- a/docs/syntax/ishikawa.md
+++ b/docs/syntax/ishikawa.md
@@ -4,7 +4,7 @@
 >
 > ## Please edit the corresponding file in [/packages/mermaid/src/docs/syntax/ishikawa.md](../../packages/mermaid/src/docs/syntax/ishikawa.md).
 
-# Ishikawa diagram (v\+)
+# Ishikawa diagram (v11.12.3+)
 
 Ishikawa diagrams are used to represent causes of a specific event (or a problem).
 They are also known as fishbone diagrams, herringbone diagrams or cause-and-effect diagrams.
diff --git a/docs/syntax/sequenceDiagram.md b/docs/syntax/sequenceDiagram.md
index ef4637817a4..87992203fc0 100644
--- a/docs/syntax/sequenceDiagram.md
+++ b/docs/syntax/sequenceDiagram.md
@@ -424,7 +424,7 @@ Lines can be solid or dotted, and can end with various types of arrowheads, cros
 | `-)`     | Solid line with an open arrow at the end (async)     |
 | `--)`    | Dotted line with a open arrow at the end (async)     |
 
-**Half-Arrows (v\+)**
+**Half-Arrows (v11.12.3+)**
 
 The following half-arrow types are supported for more expressive sequence diagrams. Both solid and dotted variants are available by increasing the number of dashes (`-` → `--`).
 
@@ -449,7 +449,7 @@ The following half-arrow types are supported for more expressive sequence diagra
 | `\\-`   | Solid line with reverse bottom stick half arrowhead  |
 | `\\--`  | Dotted line with reverse bottom stick half arrowhead |
 
-## Central Connections (v\+)
+## Central Connections (v11.12.3+)
 
 Mermaid sequence diagrams support **central lifeline connections** using a `()`.
 This is useful to represent messages or signals that connect to a central point, rather than from one actor directly to another.
diff --git a/docs/syntax/venn.md b/docs/syntax/venn.md
index 219360b922f..309117b41a8 100644
--- a/docs/syntax/venn.md
+++ b/docs/syntax/venn.md
@@ -4,7 +4,7 @@
 >
 > ## Please edit the corresponding file in [/packages/mermaid/src/docs/syntax/venn.md](../../packages/mermaid/src/docs/syntax/venn.md).
 
-# Venn diagrams (v\+)
+# Venn diagrams (v\11.12.3+)
 
 Venn diagrams show relationships between sets using overlapping circles.
 
diff --git a/packages/examples/CHANGELOG.md b/packages/examples/CHANGELOG.md
index befef1a41cd..5ca8a99f06f 100644
--- a/packages/examples/CHANGELOG.md
+++ b/packages/examples/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @mermaid-js/examples
 
+## 1.1.0
+
+### Minor Changes
+
+- [#7387](https://github.com/mermaid-js/mermaid/pull/7387) [`acce4db`](https://github.com/mermaid-js/mermaid/commit/acce4db7a1bd8801666f1a9667a63e4010ec2020) Thanks [@exoego](https://github.com/exoego)! - feat: Add Ishikawa diagram (ishikawa-beta)
+
 ## 1.0.0
 
 ### Minor Changes
diff --git a/packages/examples/package.json b/packages/examples/package.json
index 10f66c2b955..ab2e10b9a80 100644
--- a/packages/examples/package.json
+++ b/packages/examples/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mermaid-js/examples",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Mermaid examples package",
   "author": "Sidharth Vinod",
   "license": "MIT",
diff --git a/packages/mermaid-layout-elk/CHANGELOG.md b/packages/mermaid-layout-elk/CHANGELOG.md
index 3b9bd1614ba..2c5fb92ca3f 100644
--- a/packages/mermaid-layout-elk/CHANGELOG.md
+++ b/packages/mermaid-layout-elk/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @mermaid-js/layout-elk
 
+## 0.2.1
+
+### Patch Changes
+
+- [#7425](https://github.com/mermaid-js/mermaid/pull/7425) [`f16bfbb`](https://github.com/mermaid-js/mermaid/commit/f16bfbbd3b4cf59f816913029760031bf778f41d) Thanks [@knsv](https://github.com/knsv)! - fix: use rounded right-angle edges for ELK layout
+
+  ELK layout edges now default to `rounded` curve (right-angle segments with rounded corners) instead of inheriting the global `basis` default. This fixes ELK edges that were curving instead of routing at right angles (#7213). Non-ELK layouts are unaffected and keep their existing `basis` default.
+
+- Updated dependencies [[`96a766d`](https://github.com/mermaid-js/mermaid/commit/96a766dcdbb7d6e3043344a2ee3f1b64ba7a62c3), [`32723b2`](https://github.com/mermaid-js/mermaid/commit/32723b2de13474d7d13e9292e6f801e9874936ab), [`a60e615`](https://github.com/mermaid-js/mermaid/commit/a60e615bc31edeb1d623d096117812c0f721f2f8), [`1a9d45a`](https://github.com/mermaid-js/mermaid/commit/1a9d45abf0a991c40985021e8b523c32b46dd897), [`96ca7c0`](https://github.com/mermaid-js/mermaid/commit/96ca7c090f28eea458027e6871903d789575cfa1), [`60f6331`](https://github.com/mermaid-js/mermaid/commit/60f633101cd2e55ee80ad2250ae57d4c970430e5), [`fa15ce8`](https://github.com/mermaid-js/mermaid/commit/fa15ce8502d2f1d72787998d9d944c5a98b992dd), [`33c7c72`](https://github.com/mermaid-js/mermaid/commit/33c7c7206400509537a28f15d0e817340c482cb4), [`3c069b5`](https://github.com/mermaid-js/mermaid/commit/3c069b52859470dea89f45d5f859b1087b7e1fee), [`9745f32`](https://github.com/mermaid-js/mermaid/commit/9745f325cb9e1967640f0e85da193a2f820634f1), [`d6db0b0`](https://github.com/mermaid-js/mermaid/commit/d6db0b039654f6e122c6098821bc75f2910915e3), [`cdacb0b`](https://github.com/mermaid-js/mermaid/commit/cdacb0b30171bd15223c008a56c09f7ece842940), [`a408b55`](https://github.com/mermaid-js/mermaid/commit/a408b5586fb57aac54da4606940779562078f91d), [`712c1ec`](https://github.com/mermaid-js/mermaid/commit/712c1ec1222a771b38cd3b8a5ddf9c2fc4e2cbcc), [`981a62e`](https://github.com/mermaid-js/mermaid/commit/981a62e4ee6078d27a541db35df441734434d5c1), [`a4bb0b5`](https://github.com/mermaid-js/mermaid/commit/a4bb0b5920e24e44f1a12b163fdcfe6de672871a), [`b0f9d5b`](https://github.com/mermaid-js/mermaid/commit/b0f9d5b3aaf01bf5662525bcf59ac42d4bf069ab), [`981fbb8`](https://github.com/mermaid-js/mermaid/commit/981fbb8bd8be584d443dbdc14c84a2718906421d), [`93aa657`](https://github.com/mermaid-js/mermaid/commit/93aa6575788bdee992d4a60102b1dfdf95c9f4ce), [`6bc6617`](https://github.com/mermaid-js/mermaid/commit/6bc6617ca6a30b05d35d5ea1dacb940729ab42fd), [`73e9849`](https://github.com/mermaid-js/mermaid/commit/73e9849f993cd766eecddf349e335a4473560f37), [`9d0669a`](https://github.com/mermaid-js/mermaid/commit/9d0669a8c04281c3e96b96f285d4dd5d9e0088d7), [`acce4db`](https://github.com/mermaid-js/mermaid/commit/acce4db7a1bd8801666f1a9667a63e4010ec2020), [`7eed6a1`](https://github.com/mermaid-js/mermaid/commit/7eed6a1c347886461c931676b3ca22c1d5f3e1a8), [`2000680`](https://github.com/mermaid-js/mermaid/commit/2000680429204b0dd3a970bccfa47e8395f6b00d), [`b7c66a2`](https://github.com/mermaid-js/mermaid/commit/b7c66a220adc811404660004d19c81fc26b0fb53), [`f16bfbb`](https://github.com/mermaid-js/mermaid/commit/f16bfbbd3b4cf59f816913029760031bf778f41d), [`aac86f7`](https://github.com/mermaid-js/mermaid/commit/aac86f7de32a65fa850db20f14f65565a191564e), [`9745f32`](https://github.com/mermaid-js/mermaid/commit/9745f325cb9e1967640f0e85da193a2f820634f1), [`2dd29be`](https://github.com/mermaid-js/mermaid/commit/2dd29bee254a5b89c00eb0b0da1bcf7fe96ce46c), [`ace0367`](https://github.com/mermaid-js/mermaid/commit/ace0367afd0100ef645f7a583ba4cfbd08064133), [`09b74f1`](https://github.com/mermaid-js/mermaid/commit/09b74f1c29edf3d51c96d3ef17cb63af036908e1), [`33c7c72`](https://github.com/mermaid-js/mermaid/commit/33c7c7206400509537a28f15d0e817340c482cb4), [`835de00`](https://github.com/mermaid-js/mermaid/commit/835de0012d7e9981eceafd252b423768e9248830), [`a9e4c72`](https://github.com/mermaid-js/mermaid/commit/a9e4c72ed124b4ee632c1c9154838ab10e2d5e03), [`ff15e51`](https://github.com/mermaid-js/mermaid/commit/ff15e51d2e26df8f6331021ea83fe3a44d450b94), [`8bfd477`](https://github.com/mermaid-js/mermaid/commit/8bfd47758ad5255459d0cced5210d3cb8cfa6f91), [`b136acd`](https://github.com/mermaid-js/mermaid/commit/b136acdc670dee2e4825d5d93e825c0ed0551beb), [`e0317ac`](https://github.com/mermaid-js/mermaid/commit/e0317ac764349d5049f3ebeee30a15c2febc911b)]:
+  - mermaid@11.13.0
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/packages/mermaid-layout-elk/package.json b/packages/mermaid-layout-elk/package.json
index e47d64edf92..625e035daae 100644
--- a/packages/mermaid-layout-elk/package.json
+++ b/packages/mermaid-layout-elk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mermaid-js/layout-elk",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "ELK layout engine for mermaid",
   "module": "dist/mermaid-layout-elk.core.mjs",
   "types": "dist/layouts.d.ts",
diff --git a/packages/mermaid-layout-elk/src/render.ts b/packages/mermaid-layout-elk/src/render.ts
index 2cb12e0358c..fc22b7dc313 100644
--- a/packages/mermaid-layout-elk/src/render.ts
+++ b/packages/mermaid-layout-elk/src/render.ts
@@ -893,6 +893,7 @@ export const render = async (
       x: any;
       labels: { height: number; width: number; x: number; y: number }[];
       y: any;
+      curve?: any;
     }) => {
       // (elem, edge, clusterDb, diagramType, graph, id)
       const startNode = nodeDb[edge.sources[0]];
@@ -1069,6 +1070,9 @@ export const render = async (
           });
         }
         edge.points = deduped;
+        // ELK produces orthogonal edge routes — override the curve to 'rounded' (right-angle
+        // segments with rounded corners) so basis/smooth interpolation doesn't distort them.
+        edge.curve = 'rounded';
         const paths = insertEdge(
           edgesEl,
           edge,
diff --git a/packages/mermaid/CHANGELOG.md b/packages/mermaid/CHANGELOG.md
index 2febfed7259..676806e524a 100644
--- a/packages/mermaid/CHANGELOG.md
+++ b/packages/mermaid/CHANGELOG.md
@@ -1,5 +1,134 @@
 # mermaid
 
+## 11.13.0
+
+### Minor Changes
+
+- [#7352](https://github.com/mermaid-js/mermaid/pull/7352) [`d6db0b0`](https://github.com/mermaid-js/mermaid/commit/d6db0b039654f6e122c6098821bc75f2910915e3) Thanks [@remcohaszing](https://github.com/remcohaszing)! - feat: Export the `AsyncIconLoader`, `SyncIconLoader`, and `IconLoader` types.
+
+- [#5932](https://github.com/mermaid-js/mermaid/pull/5932) [`cdacb0b`](https://github.com/mermaid-js/mermaid/commit/cdacb0b30171bd15223c008a56c09f7ece842940) Thanks [@exoego](https://github.com/exoego)! - feat: Add venn-beta diagram
+
+- [#6789](https://github.com/mermaid-js/mermaid/pull/6789) [`73e9849`](https://github.com/mermaid-js/mermaid/commit/73e9849f993cd766eecddf349e335a4473560f37) Thanks [@omkarht](https://github.com/omkarht)! - feat: Add half-arrowheads (solid & stick) and central connection support
+
+- [#7387](https://github.com/mermaid-js/mermaid/pull/7387) [`acce4db`](https://github.com/mermaid-js/mermaid/commit/acce4db7a1bd8801666f1a9667a63e4010ec2020) Thanks [@exoego](https://github.com/exoego)! - feat: Add Ishikawa diagram (ishikawa-beta)
+
+- [#6995](https://github.com/mermaid-js/mermaid/pull/6995) [`9745f32`](https://github.com/mermaid-js/mermaid/commit/9745f325cb9e1967640f0e85da193a2f820634f1) Thanks [@darshanr0107](https://github.com/darshanr0107)! - feat: Deprecate [`flowchart.htmlLabels`](https://mermaid.js.org/config/schema-docs/config-defs-flowchart-diagram-config.html#htmllabels) in favor of [root-level `htmlLabels`](https://mermaid.js.org/config/schema-docs/config.html#htmllabels) in Mermaid config
+
+- [#5814](https://github.com/mermaid-js/mermaid/pull/5814) [`2dd29be`](https://github.com/mermaid-js/mermaid/commit/2dd29bee254a5b89c00eb0b0da1bcf7fe96ce46c) Thanks [@kairi003](https://github.com/kairi003)! - feat: allow to put notes in namespaces on classDiagram
+
+### Patch Changes
+
+- [#7075](https://github.com/mermaid-js/mermaid/pull/7075) [`96a766d`](https://github.com/mermaid-js/mermaid/commit/96a766dcdbb7d6e3043344a2ee3f1b64ba7a62c3) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: Prevent HTML tags from being escaped in sandbox label rendering
+
+- [#6843](https://github.com/mermaid-js/mermaid/pull/6843) [`32723b2`](https://github.com/mermaid-js/mermaid/commit/32723b2de13474d7d13e9292e6f801e9874936ab) Thanks [@saurabhg772244](https://github.com/saurabhg772244)! - fix: Support edge animation in hand drawn look
+
+- [#7453](https://github.com/mermaid-js/mermaid/pull/7453) [`a60e615`](https://github.com/mermaid-js/mermaid/commit/a60e615bc31edeb1d623d096117812c0f721f2f8) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: ER diagram edge label positioning
+
+- [#6989](https://github.com/mermaid-js/mermaid/pull/6989) [`1a9d45a`](https://github.com/mermaid-js/mermaid/commit/1a9d45abf0a991c40985021e8b523c32b46dd897) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: Resolved parsing error where direction TD was not recognized within subgraphs
+
+- [#7178](https://github.com/mermaid-js/mermaid/pull/7178) [`96ca7c0`](https://github.com/mermaid-js/mermaid/commit/96ca7c090f28eea458027e6871903d789575cfa1) Thanks [@omkarht](https://github.com/omkarht)! - fix(treemap): Fixed treemap classDef style application to properly apply user-defined styles
+
+- [#7076](https://github.com/mermaid-js/mermaid/pull/7076) [`60f6331`](https://github.com/mermaid-js/mermaid/commit/60f633101cd2e55ee80ad2250ae57d4c970430e5) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: Correct viewBox casing and make SVGs responsive
+
+- [#7055](https://github.com/mermaid-js/mermaid/pull/7055) [`fa15ce8`](https://github.com/mermaid-js/mermaid/commit/fa15ce8502d2f1d72787998d9d944c5a98b992dd) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: Improve participant parsing and prevent recursive loops on invalid syntax
+
+- [#7276](https://github.com/mermaid-js/mermaid/pull/7276) [`33c7c72`](https://github.com/mermaid-js/mermaid/commit/33c7c7206400509537a28f15d0e817340c482cb4) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: respect `markdownAutoWrap: false` to prevent text auto-wrapping in flowchart markdown labels with `htmlLabels` enabled.
+
+  Markdown labels with `markdownAutoWrap: false, htmlLabels: false` set doesn't work
+  correctly.
+
+- [#7416](https://github.com/mermaid-js/mermaid/pull/7416) [`3c069b5`](https://github.com/mermaid-js/mermaid/commit/3c069b52859470dea89f45d5f859b1087b7e1fee) Thanks [@Crafter-Y](https://github.com/Crafter-Y)! - fix: architecture diagram lines should now have the correct length
+
+- [#6995](https://github.com/mermaid-js/mermaid/pull/6995) [`9745f32`](https://github.com/mermaid-js/mermaid/commit/9745f325cb9e1967640f0e85da193a2f820634f1) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: Support the [`htmlLabels` Mermaid config value](https://mermaid.js.org/config/schema-docs/config.html#htmllabels) whenever possible
+
+- [#7293](https://github.com/mermaid-js/mermaid/pull/7293) [`a408b55`](https://github.com/mermaid-js/mermaid/commit/a408b5586fb57aac54da4606940779562078f91d) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: Prevent browser hang when using multiline accDescr in XY charts
+
+- [#6119](https://github.com/mermaid-js/mermaid/pull/6119) [`712c1ec`](https://github.com/mermaid-js/mermaid/commit/712c1ec1222a771b38cd3b8a5ddf9c2fc4e2cbcc) Thanks [@NealGooch](https://github.com/NealGooch)! - fix: correct block positioning when nested blocks span multiple columns
+
+- [#7424](https://github.com/mermaid-js/mermaid/pull/7424) [`981a62e`](https://github.com/mermaid-js/mermaid/commit/981a62e4ee6078d27a541db35df441734434d5c1) Thanks [@knsv](https://github.com/knsv)! - fix: correct BT orientation arc sweep flags in gitGraph drawArrow()
+
+  Swapped SVG arc sweep-flag values in the BT (bottom-to-top) orientation branches of `drawArrow()` so curves bend in the correct direction. Affects both rerouting and non-rerouting code paths for merge and non-merge arrows.
+
+  Resolves #6593
+
+- [#7430](https://github.com/mermaid-js/mermaid/pull/7430) [`a4bb0b5`](https://github.com/mermaid-js/mermaid/commit/a4bb0b5920e24e44f1a12b163fdcfe6de672871a) Thanks [@knsv](https://github.com/knsv)! - fix: allow colons in stateDiagram-v2 transition and state description text
+
+- [#7432](https://github.com/mermaid-js/mermaid/pull/7432) [`b0f9d5b`](https://github.com/mermaid-js/mermaid/commit/b0f9d5b3aaf01bf5662525bcf59ac42d4bf069ab) Thanks [@knsv](https://github.com/knsv)! - fix: derive taskTextDarkColor from doneTaskBkgColor in dark theme for readable done-task text
+
+- [#7456](https://github.com/mermaid-js/mermaid/pull/7456) [`981fbb8`](https://github.com/mermaid-js/mermaid/commit/981fbb8bd8be584d443dbdc14c84a2718906421d) Thanks [@knsv-bot](https://github.com/knsv-bot)! - fix(gantt): restore readable outside-text color for done tasks in dark mode
+
+- [#7139](https://github.com/mermaid-js/mermaid/pull/7139) [`93aa657`](https://github.com/mermaid-js/mermaid/commit/93aa6575788bdee992d4a60102b1dfdf95c9f4ce) Thanks [@omkarht](https://github.com/omkarht)! - revert: restore original hexagon and roundedRect implementations
+
+- [#7136](https://github.com/mermaid-js/mermaid/pull/7136) [`6bc6617`](https://github.com/mermaid-js/mermaid/commit/6bc6617ca6a30b05d35d5ea1dacb940729ab42fd) Thanks [@omkarht](https://github.com/omkarht)! - feat: add alias support for new participant syntax of sequence diagrams
+
+- [#7375](https://github.com/mermaid-js/mermaid/pull/7375) [`9d0669a`](https://github.com/mermaid-js/mermaid/commit/9d0669a8c04281c3e96b96f285d4dd5d9e0088d7) Thanks [@kaigritun](https://github.com/kaigritun)! - fix(er): recognize '1' cardinality alias before relationship operators
+
+- [#7275](https://github.com/mermaid-js/mermaid/pull/7275) [`7eed6a1`](https://github.com/mermaid-js/mermaid/commit/7eed6a1c347886461c931676b3ca22c1d5f3e1a8) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: change `createLabel` to call `createText`
+
+  This adds support for KaTeX and FontAwesome icons loaded via iconpacks in some
+  older labels. There are some small changes in formatting due to standardizing this code.
+
+- [#7265](https://github.com/mermaid-js/mermaid/pull/7265) [`2000680`](https://github.com/mermaid-js/mermaid/commit/2000680429204b0dd3a970bccfa47e8395f6b00d) Thanks [@omkarht](https://github.com/omkarht)! - fix: prevent unintended opacity on SVG aws icons containing rect elements
+
+- [#7139](https://github.com/mermaid-js/mermaid/pull/7139) [`b7c66a2`](https://github.com/mermaid-js/mermaid/commit/b7c66a220adc811404660004d19c81fc26b0fb53) Thanks [@omkarht](https://github.com/omkarht)! - chore: restore original hexagon and roundedRect implementations
+
+- [#7425](https://github.com/mermaid-js/mermaid/pull/7425) [`f16bfbb`](https://github.com/mermaid-js/mermaid/commit/f16bfbbd3b4cf59f816913029760031bf778f41d) Thanks [@knsv](https://github.com/knsv)! - fix: use rounded right-angle edges for ELK layout
+
+  ELK layout edges now default to `rounded` curve (right-angle segments with rounded corners) instead of inheriting the global `basis` default. This fixes ELK edges that were curving instead of routing at right angles (#7213). Non-ELK layouts are unaffected and keep their existing `basis` default.
+
+- [#7296](https://github.com/mermaid-js/mermaid/pull/7296) [`aac86f7`](https://github.com/mermaid-js/mermaid/commit/aac86f7de32a65fa850db20f14f65565a191564e) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: Ensure correct edge label rendering for ER and requirement diagrams when flowchart htmlLabels are false
+
+- [#7019](https://github.com/mermaid-js/mermaid/pull/7019) [`ace0367`](https://github.com/mermaid-js/mermaid/commit/ace0367afd0100ef645f7a583ba4cfbd08064133) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: Mindmap breaking in ELK layout
+
+- [#6984](https://github.com/mermaid-js/mermaid/pull/6984) [`09b74f1`](https://github.com/mermaid-js/mermaid/commit/09b74f1c29edf3d51c96d3ef17cb63af036908e1) Thanks [@omkarht](https://github.com/omkarht)! - fix(er-diagram): prevent syntax error when using 'u', numbers, and decimals in node names
+
+- [#7276](https://github.com/mermaid-js/mermaid/pull/7276) [`33c7c72`](https://github.com/mermaid-js/mermaid/commit/33c7c7206400509537a28f15d0e817340c482cb4) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: Restore proper rendering of plain text flowchart labels without auto line-wrapping
+
+  This fix restores backwards compatibility with Mermaid v10 by ensuring that plain text labels in flowcharts are rendered correctly. In Mermaid v11, all labels were incorrectly being treated as markdown by default, which caused issues with text wrapping, multiline breaks, and backwards compatibility.
+
+  **What changed:**
+  - Plain text labels in flowcharts (without markdown syntax) now render as regular text
+    - For node labels and edge labels, these will line-wrap automatically. Although this isn't backwards compatible with v10, we think this is a minor change and it's worth keeping to avoid too many changes from diagrams created from v11 onwards.
+    - Plain text labels in other diagrams will continue to not line wrap.
+  - Plain text labels with `\n` characters now correctly create line breaks
+  - Plain text that looks like markdown (e.g., "1.", "- x") is no longer misinterpreted
+
+  **If you want markdown formatting:**
+  You can still use markdown in your flowchart labels by using the proper markdown syntax. Wrap your markdown text with double quotes and backticks:
+  ``node["`_markdown_ **text**`"]``
+
+  Example:
+
+  ````markdown
+  ```mermaid
+  flowchart TD
+      plain["Plain text\nwith manual line break"]
+      markdown["`This is a **markdown** _label_ that wraps and doesn't replace \n with newlines`"]
+  ```
+  ````
+
+- [#7080](https://github.com/mermaid-js/mermaid/pull/7080) [`835de00`](https://github.com/mermaid-js/mermaid/commit/835de0012d7e9981eceafd252b423768e9248830) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: Support ComponentQueue_Ext to prevent parsing error
+
+- [#7310](https://github.com/mermaid-js/mermaid/pull/7310) [`a9e4c72`](https://github.com/mermaid-js/mermaid/commit/a9e4c72ed124b4ee632c1c9154838ab10e2d5e03) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: Allow quoted string labels in architecture-beta diagrams
+
+- [#7052](https://github.com/mermaid-js/mermaid/pull/7052) [`ff15e51`](https://github.com/mermaid-js/mermaid/commit/ff15e51d2e26df8f6331021ea83fe3a44d450b94) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: Correct tooltip placement to appear near hovered element
+
+- [#7197](https://github.com/mermaid-js/mermaid/pull/7197) [`8bfd477`](https://github.com/mermaid-js/mermaid/commit/8bfd47758ad5255459d0cced5210d3cb8cfa6f91) Thanks [@omkarht](https://github.com/omkarht)! - fix: validate dates and tick interval to prevent UI freeze/crash in gantt diagramtype
+
+- [#7099](https://github.com/mermaid-js/mermaid/pull/7099) [`b136acd`](https://github.com/mermaid-js/mermaid/commit/b136acdc670dee2e4825d5d93e825c0ed0551beb) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: Mindmap rendering issue when the number of Level 2 nodes exceeds 11
+
+- [#7217](https://github.com/mermaid-js/mermaid/pull/7217) [`e0317ac`](https://github.com/mermaid-js/mermaid/commit/e0317ac764349d5049f3ebeee30a15c2febc911b) Thanks [@omkarht](https://github.com/omkarht)! - fix(gitgraph): pass gitGraphConfig to renderer functions for applying directives properly.
+
+- Updated dependencies [[`fd3fc50`](https://github.com/mermaid-js/mermaid/commit/fd3fc501461e72d11933203175d70f130c1df3c5)]:
+  - @mermaid-js/parser@1.0.1
+
+## 11.12.3
+
+### Patch Changes
+
+- Updated dependencies [[`7243340`](https://github.com/mermaid-js/mermaid/commit/72433401a8c9d90d6753b7592d556122ecb953ca)]:
+  - @mermaid-js/parser@1.0.0
+
 ## 11.12.2
 
 ### Patch Changes
diff --git a/packages/mermaid/package.json b/packages/mermaid/package.json
index c9ef7ac0af3..b338f50ca8d 100644
--- a/packages/mermaid/package.json
+++ b/packages/mermaid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mermaid",
-  "version": "11.12.2",
+  "version": "11.13.0",
   "description": "Markdown-ish syntax for generating flowcharts, mindmaps, sequence diagrams, class diagrams, gantt charts, git graphs and more.",
   "type": "module",
   "module": "./dist/mermaid.core.mjs",
diff --git a/packages/mermaid/src/dagre-wrapper/edges.js b/packages/mermaid/src/dagre-wrapper/edges.js
index cc3c78e19ca..0defc1e6fa1 100644
--- a/packages/mermaid/src/dagre-wrapper/edges.js
+++ b/packages/mermaid/src/dagre-wrapper/edges.js
@@ -1,6 +1,7 @@
 import { log } from '../logger.js';
 import createLabel from './createLabel.js';
 import { createText } from '../rendering-util/createText.js';
+import { computeLabelTransform } from '../rendering-util/labelTransform.js';
 import { line, curveBasis, select } from 'd3';
 import { getConfig } from '../diagram-api/diagramAPI.js';
 import { getEffectiveHtmlLabels } from '../config.js';
@@ -49,16 +50,22 @@ export const insertEdgeLabel = async (elem, edge) => {
 
   label.node().appendChild(labelElement);
 
-  // Center the label
   let bbox = labelElement.getBBox();
+  let transformBbox = bbox;
   if (useHtmlLabels) {
     const div = labelElement.children[0];
     const dv = select(labelElement);
     bbox = div.getBoundingClientRect();
+    transformBbox = bbox;
     dv.attr('width', bbox.width);
     dv.attr('height', bbox.height);
+  } else {
+    const textEl = select(labelElement).select('text').node();
+    if (textEl && typeof textEl.getBBox === 'function') {
+      transformBbox = textEl.getBBox();
+    }
   }
-  label.attr('transform', 'translate(' + -bbox.width / 2 + ', ' + -bbox.height / 2 + ')');
+  label.attr('transform', computeLabelTransform(transformBbox, useHtmlLabels));
 
   // Make element accessible by id for positioning
   edgeLabels[edge.id] = edgeLabel;
@@ -82,7 +89,7 @@ export const insertEdgeLabel = async (elem, edge) => {
       dv.attr('width', slBox.width);
       dv.attr('height', slBox.height);
     }
-    inner.attr('transform', 'translate(' + -slBox.width / 2 + ', ' + -slBox.height / 2 + ')');
+    inner.attr('transform', computeLabelTransform(slBox, useHtmlLabels));
     if (!terminalLabels[edge.id]) {
       terminalLabels[edge.id] = {};
     }
@@ -108,7 +115,7 @@ export const insertEdgeLabel = async (elem, edge) => {
       dv.attr('width', slBox.width);
       dv.attr('height', slBox.height);
     }
-    inner.attr('transform', 'translate(' + -slBox.width / 2 + ', ' + -slBox.height / 2 + ')');
+    inner.attr('transform', computeLabelTransform(slBox, useHtmlLabels));
 
     if (!terminalLabels[edge.id]) {
       terminalLabels[edge.id] = {};
@@ -130,7 +137,7 @@ export const insertEdgeLabel = async (elem, edge) => {
       dv.attr('width', slBox.width);
       dv.attr('height', slBox.height);
     }
-    inner.attr('transform', 'translate(' + -slBox.width / 2 + ', ' + -slBox.height / 2 + ')');
+    inner.attr('transform', computeLabelTransform(slBox, useHtmlLabels));
 
     endEdgeLabelLeft.node().appendChild(endLabelElement);
 
@@ -154,7 +161,7 @@ export const insertEdgeLabel = async (elem, edge) => {
       dv.attr('width', slBox.width);
       dv.attr('height', slBox.height);
     }
-    inner.attr('transform', 'translate(' + -slBox.width / 2 + ', ' + -slBox.height / 2 + ')');
+    inner.attr('transform', computeLabelTransform(slBox, useHtmlLabels));
 
     endEdgeLabelRight.node().appendChild(endLabelElement);
     if (!terminalLabels[edge.id]) {
diff --git a/packages/mermaid/src/diagrams/gantt/styles.js b/packages/mermaid/src/diagrams/gantt/styles.js
index 776083a9ce3..24cb9d9f648 100644
--- a/packages/mermaid/src/diagrams/gantt/styles.js
+++ b/packages/mermaid/src/diagrams/gantt/styles.js
@@ -191,6 +191,19 @@ const getStyles = (options) =>
     fill: ${options.taskTextDarkColor} !important;
   }
 
+  /* Done task text displayed outside the bar sits against the diagram background,
+     not against the done-task bar, so it must use the outside/contrast color. */
+  .doneText0.taskTextOutsideLeft,
+  .doneText0.taskTextOutsideRight,
+  .doneText1.taskTextOutsideLeft,
+  .doneText1.taskTextOutsideRight,
+  .doneText2.taskTextOutsideLeft,
+  .doneText2.taskTextOutsideRight,
+  .doneText3.taskTextOutsideLeft,
+  .doneText3.taskTextOutsideRight {
+    fill: ${options.taskTextOutsideColor} !important;
+  }
+
 
   /* Tasks on the critical line */
 
@@ -237,6 +250,18 @@ const getStyles = (options) =>
     fill: ${options.taskTextDarkColor} !important;
   }
 
+  /* Done-crit task text outside the bar — same reasoning as doneText above. */
+  .doneCritText0.taskTextOutsideLeft,
+  .doneCritText0.taskTextOutsideRight,
+  .doneCritText1.taskTextOutsideLeft,
+  .doneCritText1.taskTextOutsideRight,
+  .doneCritText2.taskTextOutsideLeft,
+  .doneCritText2.taskTextOutsideRight,
+  .doneCritText3.taskTextOutsideLeft,
+  .doneCritText3.taskTextOutsideRight {
+    fill: ${options.taskTextOutsideColor} !important;
+  }
+
   .vert {
     stroke: ${options.vertLineColor};
   }
diff --git a/packages/mermaid/src/docs/.vitepress/components/EditorSelectionModal.vue b/packages/mermaid/src/docs/.vitepress/components/EditorSelectionModal.vue
index 26fe156bec6..7399459fe8c 100644
--- a/packages/mermaid/src/docs/.vitepress/components/EditorSelectionModal.vue
+++ b/packages/mermaid/src/docs/.vitepress/components/EditorSelectionModal.vue
@@ -1,5 +1,6 @@