Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

## [Unreleased]

### 🔄 Changed
- Updated the bundled Mermaid runtime to [mermaid@11.17.0](https://github.com/mermaid-js/mermaid/releases/tag/mermaid%4011.17.0).

### 📚 Documentation
- Added a bilingual FAQ for the Mermaid preview conflict with the official Mermaid plugin bundled in JetBrains IDE 2026.2+, including an error screenshot and step-by-step plugin disable instructions.

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

## [Unreleased]

### 🔄 变更
- 将内置 Mermaid runtime 更新到 [mermaid@11.17.0](https://github.com/mermaid-js/mermaid/releases/tag/mermaid%4011.17.0)。

### 📚 文档
- 新增中英文 FAQ,说明 JetBrains IDE 2026.2+ 内置官方 Mermaid 插件后可能产生的预览冲突,并补充报错截图及逐步禁用插件的操作说明。

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
[![Marketplace downloads](https://img.shields.io/jetbrains/plugin/d/31518?label=Downloads&logo=jetbrains)](https://plugins.jetbrains.com/plugin/31518-mermaid-markdown-bridge)
[![GitHub issues](https://img.shields.io/github/issues/zhongmiao-org/mermaid-markdown-bridge)](https://github.com/zhongmiao-org/mermaid-markdown-bridge/issues)
[![License](https://img.shields.io/github/license/zhongmiao-org/mermaid-markdown-bridge)](./LICENSE)
[![Mermaid](https://img.shields.io/badge/Mermaid-11.16.1-ff3670)](https://github.com/mermaid-js/mermaid/releases/tag/mermaid%4011.16.1)
[![Mermaid](https://img.shields.io/badge/Mermaid-11.17.0-ff3670)](https://github.com/mermaid-js/mermaid/releases/tag/mermaid%4011.17.0)
![Kotlin](https://img.shields.io/badge/Kotlin-2.3.21-7F52FF?logo=kotlin&logoColor=white)
![JetBrains Platform](https://img.shields.io/badge/JetBrains%20Platform-2023.3%2B-000000?logo=jetbrains&logoColor=white)

Expand Down
2 changes: 1 addition & 1 deletion README_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
[![Marketplace downloads](https://img.shields.io/jetbrains/plugin/d/31518?label=Downloads&logo=jetbrains)](https://plugins.jetbrains.com/plugin/31518-mermaid-markdown-bridge)
[![GitHub issues](https://img.shields.io/github/issues/zhongmiao-org/mermaid-markdown-bridge)](https://github.com/zhongmiao-org/mermaid-markdown-bridge/issues)
[![License](https://img.shields.io/github/license/zhongmiao-org/mermaid-markdown-bridge)](./LICENSE)
[![Mermaid](https://img.shields.io/badge/Mermaid-11.16.1-ff3670)](https://github.com/mermaid-js/mermaid/releases/tag/mermaid%4011.16.1)
[![Mermaid](https://img.shields.io/badge/Mermaid-11.17.0-ff3670)](https://github.com/mermaid-js/mermaid/releases/tag/mermaid%4011.17.0)
![Kotlin](https://img.shields.io/badge/Kotlin-2.3.21-7F52FF?logo=kotlin&logoColor=white)
![JetBrains Platform](https://img.shields.io/badge/JetBrains%20Platform-2023.3%2B-000000?logo=jetbrains&logoColor=white)

Expand Down
977 changes: 513 additions & 464 deletions src/main/resources/mermaid/mermaid.min.js

Large diffs are not rendered by default.