-
-
Notifications
You must be signed in to change notification settings - Fork 6.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/mermaid-js/mermaid into d…
…evelop * 'master' of https://github.com/mermaid-js/mermaid: chore: Fix link Update docs fixup, docs: update plugin's name Update docs Changed Mermaid Chart GPT plugin's name Updated Mermaid Chart ChatGPT plugin link run the pnpm --filter mermaid run docs:build command Update flowchart.md Lint fix Fix for proper handling of block-diagram labels Fix for proper handling of block-diagram labels docs: Add blog post - Documentation Software (#5519) update content add ai blog post
- Loading branch information
Showing
11 changed files
with
187 additions
and
30 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| <html> | ||
| <head> | ||
| <link href="https://fonts.googleapis.com/css?family=Montserrat&display=swap" rel="stylesheet" /> | ||
| <link href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet" /> | ||
| <link | ||
| rel="stylesheet" | ||
| href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" | ||
| /> | ||
| <link | ||
| href="https://fonts.googleapis.com/css?family=Noto+Sans+SC&display=swap" | ||
| rel="stylesheet" | ||
| /> | ||
| <style> | ||
| body { | ||
| /* background: rgb(221, 208, 208); */ | ||
| /* background:#333; */ | ||
| font-family: 'Arial'; | ||
| /* font-size: 18px !important; */ | ||
| } | ||
| h1 { | ||
| color: grey; | ||
| } | ||
| .mermaid2 { | ||
| display: none; | ||
| } | ||
| .mermaid svg { | ||
| /* font-size: 18px !important; */ | ||
| } | ||
| .malware { | ||
| position: fixed; | ||
| bottom: 0; | ||
| left: 0; | ||
| right: 0; | ||
| height: 150px; | ||
| background: red; | ||
| color: black; | ||
| display: flex; | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| font-family: monospace; | ||
| font-size: 72px; | ||
| } | ||
| </style> | ||
| <script> | ||
| function xssAttack() { | ||
| const div = document.createElement('div'); | ||
| div.id = 'the-malware'; | ||
| div.className = 'malware'; | ||
| div.innerHTML = 'XSS Succeeded'; | ||
| document.getElementsByTagName('body')[0].appendChild(div); | ||
| throw new Error('XSS Succeeded'); | ||
| } | ||
| </script> | ||
| </head> | ||
| <body> | ||
| <div>Security check</div> | ||
| <div class="flex"> | ||
| <div id="diagram" class="mermaid"></div> | ||
| <div id="res" class=""></div> | ||
| </div> | ||
| <script type="module"> | ||
| import mermaid from './mermaid.esm.mjs'; | ||
| mermaid.parseError = function (err, hash) { | ||
| // console.error('Mermaid error: ', err); | ||
| }; | ||
| mermaid.initialize({ | ||
| theme: 'forest', | ||
| arrowMarkerAbsolute: true, | ||
| // themeCSS: '.edgePath .path {stroke: red;} .arrowheadPath {fill: red;}', | ||
| logLevel: 0, | ||
| state: { | ||
| defaultRenderer: 'dagre-wrapper', | ||
| }, | ||
| flowchart: { | ||
| // defaultRenderer: 'dagre-wrapper', | ||
| nodeSpacing: 10, | ||
| curve: 'cardinal', | ||
| htmlLabels: true, | ||
| }, | ||
| htmlLabels: false, | ||
| // gantt: { axisFormat: '%m/%d/%Y' }, | ||
| sequence: { actorFontFamily: 'courier', actorMargin: 50, showSequenceNumbers: false }, | ||
| // sequenceDiagram: { actorMargin: 300 } // deprecated | ||
| // fontFamily: '"times", sans-serif', | ||
| // fontFamily: 'courier', | ||
| fontSize: 18, | ||
| curve: 'basis', | ||
| securityLevel: 'strict', | ||
| startOnLoad: false, | ||
| secure: ['secure', 'securityLevel', 'startOnLoad', 'maxTextSize'], | ||
| // themeVariables: {relationLabelColor: 'red'} | ||
| }); | ||
| function callback() { | ||
| alert('It worked'); | ||
| } | ||
|
|
||
| let diagram = 'block-beta\n'; | ||
| diagram += '`A-- "X<img src=x on'; | ||
| diagram += 'error=xssAttack()>" -->B'; | ||
|
|
||
| console.log(diagram); | ||
| // document.querySelector('#diagram').innerHTML = diagram; | ||
| const { svg } = await mermaid.render('diagram', diagram); | ||
| document.querySelector('#res').innerHTML = svg; | ||
| </script> | ||
| </body> | ||
| </html> |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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