Merge main to release-1.1#1811
Merged
LeighFinegold merged 10 commits intorelease-1.1from Nov 18, 2025
Merged
Conversation
… decoding for security
fix(calm-widgets): update mermaid ID handling and sanitize identifier…
ci(cli): release version 1.14.2
chore: update Java VM arguments for improved performance on MacOS
rocketstack-matt
requested review from
a team,
LeighFinegold,
Thels,
aidanm3341,
grahampacker-ms,
jpgough-ms,
lbulanti-ms,
markscott-ms and
willosborne
as code owners
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR merges changes from main into release-1.1, primarily introducing a mermaidId helper function to sanitize node identifiers in Mermaid diagrams. This prevents conflicts with Mermaid's reserved keywords by prefixing problematic identifiers with "node_".
Key changes:
- Introduction of
mermaidIdhelper function across three locations (docusaurus-transformer, widget-helpers, and utils) to handle Mermaid reserved word conflicts - Comprehensive updates to all Handlebars templates to use the new
mermaidIdhelper for node IDs in Mermaid diagrams - HTML entity decoding before rendering Mermaid diagrams in the VSCode extension
- Version bumps for CLI (1.14.1 → 1.14.2) and VSCode plugin (0.0.8 → 0.0.9)
Reviewed Changes
Copilot reviewed 21 out of 21 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| shared/src/docify/template-bundles/docusaurus/relationships.hbs | Updated all node ID references to use mermaidId helper for safe Mermaid rendering |
| shared/src/docify/template-bundles/docusaurus/docusaurus-transformer.ts | Added mermaidId helper implementation with reserved word detection and prefixing |
| cli/package.json | Version bump from 1.14.1 to 1.14.2 |
| cli/CHANGELOG.md | Added changelog entry for version 1.14.2 |
| calm-widgets/src/widgets/related-nodes/related-nodes-template.hbs | Applied mermaidId helper to node IDs in relationship template |
| calm-widgets/src/widgets/related-nodes/interacts-relationship.hbs | Applied mermaidId helper to interacts relationship nodes |
| calm-widgets/src/widgets/related-nodes/deployed-in-relationship.hbs | Applied mermaidId helper to deployed-in relationship nodes |
| calm-widgets/src/widgets/related-nodes/connects-relationship.hbs | Applied mermaidId helper to connects relationship nodes |
| calm-widgets/src/widgets/related-nodes/composed-of-relationship.hbs | Applied mermaidId helper to composed-of relationship nodes |
| calm-widgets/src/widgets/block-architecture/typed-node.hbs | Applied mermaidId helper to all node type shapes and class declarations |
| calm-widgets/src/widgets/block-architecture/core/utils.ts | Added mermaidId function to sanitize IDs for Mermaid diagrams |
| calm-widgets/src/widgets/block-architecture/core/utils.spec.ts | Added comprehensive tests for mermaidId function behavior |
| calm-widgets/src/widgets/block-architecture/container.hbs | Applied mermaidId helper to container subgraphs and nodes |
| calm-widgets/src/widgets/block-architecture/click-links.hbs | Applied mermaidId helper to click event bindings |
| calm-widgets/src/widgets/block-architecture/block-architecture.hbs | Applied mermaidId helper to nodes, edges, attachments, and highlights |
| calm-widgets/src/widget-helpers.ts | Added mermaidId Handlebars helper with sanitization and reserved word handling |
| calm-widgets/src/widget-helpers.spec.ts | Added comprehensive tests for mermaidId Handlebars helper |
| calm-plugins/vscode/src/features/preview/webview/mermaid-renderer.ts | Added HTML entity decoding before rendering Mermaid diagrams for security |
| calm-plugins/vscode/src/features/preview/docify-tab/view/docify-tab.view.ts | Updated node ID extraction to handle node_ prefix added by mermaidId helper |
| calm-plugins/vscode/package.json | Version bump from 0.0.8 to 0.0.9 |
| .vscode/settings.json | Changed Java VM arguments from ParallelGC with 4GB to G1GC with 2GB heap |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
LeighFinegold
approved these changes
Nov 18, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.