Merge back master to develop

[ashishjain0512]

📑 Summary

This pull request introduces several updates and fixes, primarily focusing on improving the handling of diamond shape intersections in flowcharts and updating the mermaid-layout-elk package. The changes include new test cases for diamond shape intersections, updates to the mermaid-layout-elk package version, and adjustments to the rendering logic for diamond shapes.

Improvements to flowchart rendering:

• cypress/integration/rendering/flowchart-elk.spec.js: Added multiple test cases to handle diamond shape intersections in flowcharts.

Updates to mermaid-layout-elk package:

• packages/mermaid-layout-elk/CHANGELOG.md: Updated the changelog to include version 0.1.7 with a patch for diamond shape intersection handling.
• packages/mermaid-layout-elk/package.json: Bumped the package version from 0.1.6 to 0.1.7.

Adjustments to rendering logic:

• packages/mermaid-layout-elk/src/render.ts: Updated the rendering logic to correctly calculate offsets for diamond shapes and ensure accurate path intersections. [1] [2] [3] [4]

Minor HTML updates:

• cypress/platform/knsv2.html: Changed the class name from mermaid2 to mermaid for several <pre> tags to ensure consistent rendering. [1] [2] [3] [4]

Resolves #

📏 Design Decisions

Describe the way your implementation works or what design decisions you made if applicable.

📋 Tasks

Make sure you

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

[changeset-bot]

⚠️ No Changeset found

Latest commit: becadf0

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

[netlify]

✅ Deploy Preview for mermaid-js ready!

Name	Link
🔨 Latest commit	becadf0
🔍 Latest deploy log	https://app.netlify.com/sites/mermaid-js/deploys/674755759651000008b8e59c
😎 Deploy Preview	https://deploy-preview-6092--mermaid-js.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

---

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

[pkg-pr-new]

Open in Stackblitz

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

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

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

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

commit: becadf0

[codecov]

Codecov Report

Attention: Patch coverage is 0% with 12 lines in your changes missing coverage. Please review.

Project coverage is 4.48%. Comparing base (b4879d1) to head (becadf0).
Report is 17 commits behind head on develop.

Files with missing lines	Patch %	Lines
packages/mermaid-layout-elk/src/render.ts	0.00%	12 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           develop   #6092      +/-   ##
==========================================
- Coverage     4.49%   4.48%   -0.01%     
==========================================
  Files          383     382       -1     
  Lines        53925   54027     +102     
  Branches       596     621      +25     
==========================================
  Hits          2425    2425              
- Misses       51500   51602     +102     

Flag	Coverage Δ
unit	4.48% <0.00%> (-0.01%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines	Coverage Δ
packages/mermaid-layout-elk/src/render.ts	0.00% <0.00%> (ø)

... and 4 files with indirect coverage changes