diff --git a/.changeset/proud-seahorses-wash.md b/.changeset/proud-seahorses-wash.md new file mode 100644 index 000000000..8b844b679 --- /dev/null +++ b/.changeset/proud-seahorses-wash.md @@ -0,0 +1,5 @@ +--- +'mermaid': patch +--- + +FontAwesome icons can now be embedded as SVGs in flowcharts if they are registered via `mermaid.registerIconPacks`. diff --git a/.changeset/ten-lamps-trade.md b/.changeset/ten-lamps-trade.md new file mode 100644 index 000000000..991a70daf --- /dev/null +++ b/.changeset/ten-lamps-trade.md @@ -0,0 +1,5 @@ +--- +'mermaid': patch +--- + +fix: allow colons in events diff --git a/.cspell/code-terms.txt b/.cspell/code-terms.txt index f4862006f..285b66365 100644 --- a/.cspell/code-terms.txt +++ b/.cspell/code-terms.txt @@ -53,7 +53,6 @@ frontmatter funs gantt GENERICTYPE -getBoundarys grammr graphtype halign diff --git a/.cspell/libraries.txt b/.cspell/libraries.txt index 185d284f7..feee10fd1 100644 --- a/.cspell/libraries.txt +++ b/.cspell/libraries.txt @@ -26,6 +26,7 @@ dompurify elkjs fcose fontawesome +Fonticons Forgejo Foswiki Gitea diff --git a/.github/ISSUE_TEMPLATE/theme_proposal.yml b/.github/ISSUE_TEMPLATE/theme_proposal.yml index da4fddbec..2e55b71d6 100644 --- a/.github/ISSUE_TEMPLATE/theme_proposal.yml +++ b/.github/ISSUE_TEMPLATE/theme_proposal.yml @@ -29,7 +29,7 @@ body: label: Colors description: |- A detailed list of the different colour values to use. - A list of currently used variable names can be found [here](https://mermaid-js.github.io/mermaid/#/theming?id=theme-variables-reference-table) + See the [list of currently used variable names](https://mermaid-js.github.io/mermaid/#/theming?id=theme-variables-reference-table) placeholder: |- - background: #f4f4f4 - primaryColor: #fff4dd diff --git a/.github/lychee.toml b/.github/lychee.toml index 8032bbf98..b4e8ba0fb 100644 --- a/.github/lychee.toml +++ b/.github/lychee.toml @@ -46,7 +46,7 @@ exclude = [ # Drupal 403 "https://(www.)?drupal.org", -# Swimm returns 404, eventhough the link is valid +# Swimm returns 404, even though the link is valid "https://docs.swimm.io", # Timeout diff --git a/.github/stale.yml b/.github/stale.yml index 30c4ca4a0..94a16dfbd 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -15,5 +15,5 @@ markComment: > If you are still interested in this issue and it is still relevant you can comment to revive it. # Comment to post when closing a stale issue. Set to `false` to disable closeComment: > - This issue has been been automatically closed due to a lack of activity. + This issue has been automatically closed due to a lack of activity. This is done to maintain a clean list of issues that the community is interested in developing. diff --git a/.github/workflows/e2e-applitools.yml b/.github/workflows/e2e-applitools.yml index 9c357a581..6b4cc6098 100644 --- a/.github/workflows/e2e-applitools.yml +++ b/.github/workflows/e2e-applitools.yml @@ -45,13 +45,15 @@ jobs: - if: ${{ env.USE_APPLI }} name: Notify applitools of new batch # Copied from docs https://applitools.com/docs/topics/integrations/github-integration-ci-setup.html - run: curl -L -d '' -X POST "$APPLITOOLS_SERVER_URL/api/externals/github/push?apiKey=$APPLITOOLS_API_KEY&CommitSha=$GITHUB_SHA&BranchName=${APPLITOOLS_BRANCH}$&ParentBranchName=$APPLITOOLS_PARENT_BRANCH" env: # e.g. mermaid-js/mermaid/my-branch APPLITOOLS_BRANCH: ${{ github.repository }}/${{ github.ref_name }} APPLITOOLS_PARENT_BRANCH: ${{ github.event.inputs.parent_branch }} APPLITOOLS_API_KEY: ${{ secrets.APPLITOOLS_API_KEY }} APPLITOOLS_SERVER_URL: 'https://eyesapi.applitools.com' + uses: wei/curl@61d92b5169ea0425820dd13cf6fbad66b483e9f1 + with: + args: -X POST "$APPLITOOLS_SERVER_URL/api/externals/github/push?apiKey=$APPLITOOLS_API_KEY&CommitSha=$GITHUB_SHA&BranchName=${APPLITOOLS_BRANCH}$&ParentBranchName=$APPLITOOLS_PARENT_BRANCH" - name: Cypress run uses: cypress-io/github-action@18a6541367f4580a515371905f499a27a44e8dbe # v6.7.12 diff --git a/CHANGELOG.md b/CHANGELOG.md index ede5e19ad..8a4c0a414 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -256,7 +256,7 @@ mermaid.run({ - Problem showing graph with php on localhost [\#502](https://github.com/knsv/mermaid/issues/502) - logLevel's option doesnt work at 7.0.0 [\#501](https://github.com/knsv/mermaid/issues/501) - How do I get the log for a render or parse attempt? [\#500](https://github.com/knsv/mermaid/issues/500) -- Mermaid neutral style style to built in latest release [\#499](https://github.com/knsv/mermaid/issues/499) +- Mermaid neutral style to built in latest release [\#499](https://github.com/knsv/mermaid/issues/499) - Any plans for adding a typescript definition file? [\#495](https://github.com/knsv/mermaid/issues/495) - Gantt diagrams too narrow [\#493](https://github.com/knsv/mermaid/issues/493) - Flowchart edge labels placement [\#490](https://github.com/knsv/mermaid/issues/490) @@ -833,7 +833,7 @@ mermaid.run({ - Merge pull request \#1 from knsv/master [\#96](https://github.com/knsv/mermaid/pull/96) ([gkchic](https://github.com/gkchic)) - Removed duplicated section in flowchart docs [\#94](https://github.com/knsv/mermaid/pull/94) ([kaime](https://github.com/kaime)) - Grammar changes to sequence page [\#93](https://github.com/knsv/mermaid/pull/93) ([gkchic](https://github.com/gkchic)) -- Github buttons [\#89](https://github.com/knsv/mermaid/pull/89) ([gkchic](https://github.com/gkchic)) +- GitHub buttons [\#89](https://github.com/knsv/mermaid/pull/89) ([gkchic](https://github.com/gkchic)) - Template change [\#88](https://github.com/knsv/mermaid/pull/88) ([gkchic](https://github.com/gkchic)) ## [0.3.1](https://github.com/knsv/mermaid/tree/0.3.1) (2015-01-05) @@ -1002,4 +1002,4 @@ mermaid.run({ ## [0.1.0](https://github.com/knsv/mermaid/tree/0.1.0) (2014-11-16) -\* _This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)_ +\* _This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/GitHub-Changelog-Generator)_ diff --git a/README.md b/README.md index 2fca46b25..760ce0f25 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Try Live Editor previews of future releases: Explore Mermaid.js in depth, with real-world examples, tips & tricks from the creator... The first official book on Mermaid is available for purchase. Check it out! +Banner for "The Official Guide to Mermaid.js" book ## Table of content @@ -451,7 +451,7 @@ For public sites, it can be precarious to retrieve text from users on the intern As an extra level of security for sites with external users we are happy to introduce a new security level in which the diagram is rendered in a sandboxed iframe preventing javascript in the code from being executed. This is a great step forward for better security. -_Unfortunately you can not have a cake and eat it at the same time which in this case means that some of the interactive functionality gets blocked along with the possible malicious code._ +_Unfortunately you cannot have a cake and eat it at the same time which in this case means that some of the interactive functionality gets blocked along with the possible malicious code._ ## Reporting vulnerabilities diff --git a/README.zh-CN.md b/README.zh-CN.md index e5b20caed..cd44e56b6 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -43,13 +43,13 @@ Mermaid **感谢所有参与进来提交 PR,解答疑问的人们! 🙏** -Explore Mermaid.js in depth, with real-world examples, tips & tricks from the creator... The first official book on Mermaid is available for purchase. Check it out! +Banner for "The Official Guide to Mermaid.js" book ## 关于 Mermaid -Mermaid 是一个基于 Javascript 的图表绘制工具,通过解析类 Markdown 的文本语法来实现图表的创建和动态修改。Mermaid 诞生的主要目的是让文档的更新能够及时跟上开发进度。 +Mermaid 是一个基于 JavaScript 的图表绘制工具,通过解析类 Markdown 的文本语法来实现图表的创建和动态修改。Mermaid 诞生的主要目的是让文档的更新能够及时跟上开发进度。 > Doc-Rot 是 Mermaid 致力于解决的一个难题。 diff --git a/cypress/integration/other/interaction.spec.js b/cypress/integration/other/interaction.spec.js index 857141b5b..e57701fd9 100644 --- a/cypress/integration/other/interaction.spec.js +++ b/cypress/integration/other/interaction.spec.js @@ -20,7 +20,7 @@ describe('Interaction', () => { }); it('Graph: should handle a click on a node with a bound url', () => { - // When there is a URL, cy.contains selects the a tag instead of the span. The .node is a child of a, so we have to use find instead of parent. + // When there is a URL, `cy.contains()` selects the `a` tag instead of the `span` tag. The .node is a child of `a`, so we have to use `find()` instead of `parent`. cy.contains('URLTest1').find('.node').click(); cy.location().should(({ href }) => { expect(href).to.eq('http://localhost:9000/empty.html'); @@ -146,7 +146,7 @@ describe('Interaction', () => { }); }); - describe('Interaction - security level other, missspelling', () => { + describe('Interaction - security level other, misspelling', () => { beforeEach(() => { cy.visit('http://localhost:9000/click_security_other.html'); }); diff --git a/cypress/integration/rendering/architecture.spec.ts b/cypress/integration/rendering/architecture.spec.ts index ec74a5dd5..997a6654e 100644 --- a/cypress/integration/rendering/architecture.spec.ts +++ b/cypress/integration/rendering/architecture.spec.ts @@ -19,7 +19,7 @@ describe.skip('architecture diagram', () => { ` ); }); - it('should render a simple architecture diagram with titleAndAccessabilities', () => { + it('should render a simple architecture diagram with titleAndAccessibilities', () => { imgSnapshotTest( `architecture-beta title Simple Architecture Diagram diff --git a/cypress/integration/rendering/block.spec.js b/cypress/integration/rendering/block.spec.js index f5d5103e8..589a30fde 100644 --- a/cypress/integration/rendering/block.spec.js +++ b/cypress/integration/rendering/block.spec.js @@ -14,7 +14,7 @@ describe('Block diagram', () => { ); }); - it('BL2: should handle colums statement in sub-blocks', () => { + it('BL2: should handle columns statement in sub-blocks', () => { imgSnapshotTest( `block-beta id1["Hello"] @@ -30,7 +30,7 @@ describe('Block diagram', () => { ); }); - it('BL3: should align block widths and handle colums statement in sub-blocks', () => { + it('BL3: should align block widths and handle columns statement in sub-blocks', () => { imgSnapshotTest( `block-beta block @@ -46,7 +46,7 @@ describe('Block diagram', () => { ); }); - it('BL4: should align block widths and handle colums statements in deeper sub-blocks then 1 level', () => { + it('BL4: should align block widths and handle columns statements in deeper sub-blocks then 1 level', () => { imgSnapshotTest( `block-beta columns 1 @@ -66,7 +66,7 @@ describe('Block diagram', () => { ); }); - it('BL5: should align block widths and handle colums statements in deeper sub-blocks then 1 level (alt)', () => { + it('BL5: should align block widths and handle columns statements in deeper sub-blocks then 1 level (alt)', () => { imgSnapshotTest( `block-beta columns 1 @@ -236,7 +236,7 @@ describe('Block diagram', () => { ); }); - it('BL17: width alignment - blocks shold be equal in width', () => { + it('BL17: width alignment - blocks should be equal in width', () => { imgSnapshotTest( `block-beta A("This is the text") diff --git a/cypress/integration/rendering/classDiagram.spec.js b/cypress/integration/rendering/classDiagram.spec.js index a98a359ed..e7d201b5d 100644 --- a/cypress/integration/rendering/classDiagram.spec.js +++ b/cypress/integration/rendering/classDiagram.spec.js @@ -429,7 +429,7 @@ describe('Class diagram', () => { classDiagram class \`This\nTitle\nHas\nMany\nNewlines\` { +String Also - -Stirng Many + -String Many #int Members +And() -Many() @@ -443,7 +443,7 @@ describe('Class diagram', () => { classDiagram class \`This\nTitle\nHas\nMany\nNewlines\` { +String Also - -Stirng Many + -String Many #int Members +And() -Many() @@ -459,7 +459,7 @@ describe('Class diagram', () => { namespace testingNamespace { class \`This\nTitle\nHas\nMany\nNewlines\` { +String Also - -Stirng Many + -String Many #int Members +And() -Many() diff --git a/cypress/integration/rendering/flowchart-elk.spec.js b/cypress/integration/rendering/flowchart-elk.spec.js index c31df1181..27af2c40c 100644 --- a/cypress/integration/rendering/flowchart-elk.spec.js +++ b/cypress/integration/rendering/flowchart-elk.spec.js @@ -208,13 +208,13 @@ describe('Flowchart ELK', () => { `flowchart-elk TB internet nat - routeur + router lb1 lb2 compute1 compute2 subgraph project - routeur + router nat subgraph subnet1 compute1 @@ -225,8 +225,8 @@ describe('Flowchart ELK', () => { lb2 end end - internet --> routeur - routeur --> subnet1 & subnet2 + internet --> router + router --> subnet1 & subnet2 subnet1 & subnet2 --> nat --> internet `, { htmlLabels: true, flowchart: { htmlLabels: true }, securityLevel: 'loose' } @@ -443,7 +443,7 @@ flowchart-elk TD { htmlLabels: true, flowchart: { htmlLabels: true }, securityLevel: 'loose' } ); }); - it('63-elk: title on subgraphs should be themable', () => { + it('63-elk: title on subgraphs should be themeable', () => { imgSnapshotTest( ` %%{init:{"theme":"base", "themeVariables": {"primaryColor":"#411d4e", "titleColor":"white", "darkMode":true}}}%% diff --git a/cypress/integration/rendering/flowchart-icon.spec.js b/cypress/integration/rendering/flowchart-icon.spec.js new file mode 100644 index 000000000..a76e8aabd --- /dev/null +++ b/cypress/integration/rendering/flowchart-icon.spec.js @@ -0,0 +1,28 @@ +import { imgSnapshotTest } from '../../helpers/util.ts'; + +const themes = ['default', 'forest', 'dark', 'base', 'neutral']; + +describe('when rendering flowchart with icons', () => { + for (const theme of themes) { + it(`should render icons from fontawesome library on theme ${theme}`, () => { + imgSnapshotTest( + `flowchart TD + A("fab:fa-twitter Twitter") --> B("fab:fa-facebook Facebook") + B --> C("fa:fa-coffee Coffee") + C --> D("fa:fa-car Car") + D --> E("fab:fa-github GitHub") + `, + { theme } + ); + }); + + it(`should render registered icons on theme ${theme}`, () => { + imgSnapshotTest( + `flowchart TD + A("fa:fa-bell Bell") + `, + { theme } + ); + }); + } +}); diff --git a/cypress/integration/rendering/flowchart-v2.spec.js b/cypress/integration/rendering/flowchart-v2.spec.js index 4322500df..97fc1ecbd 100644 --- a/cypress/integration/rendering/flowchart-v2.spec.js +++ b/cypress/integration/rendering/flowchart-v2.spec.js @@ -99,7 +99,7 @@ describe('Flowchart v2', () => { const style = svg.attr('style'); expect(style).to.match(/^max-width: [\d.]+px;$/); const maxWidthValue = parseFloat(style.match(/[\d.]+/g).join('')); - expect(maxWidthValue).to.be.within(417 * 0.95, 417 * 1.05); + expect(maxWidthValue).to.be.within(440 * 0.95, 440 * 1.05); }); }); it('8: should render a flowchart when useMaxWidth is false', () => { @@ -118,7 +118,7 @@ describe('Flowchart v2', () => { const width = parseFloat(svg.attr('width')); // use within because the absolute value can be slightly different depending on the environment ±5% // expect(height).to.be.within(446 * 0.95, 446 * 1.05); - expect(width).to.be.within(417 * 0.95, 417 * 1.05); + expect(width).to.be.within(440 * 0.95, 440 * 1.05); expect(svg).to.not.have.attr('style'); }); }); @@ -198,13 +198,13 @@ describe('Flowchart v2', () => { `flowchart TB internet nat - routeur + router lb1 lb2 compute1 compute2 subgraph project - routeur + router nat subgraph subnet1 compute1 @@ -215,8 +215,8 @@ describe('Flowchart v2', () => { lb2 end end - internet --> routeur - routeur --> subnet1 & subnet2 + internet --> router + router --> subnet1 & subnet2 subnet1 & subnet2 --> nat --> internet `, { htmlLabels: true, flowchart: { htmlLabels: true }, securityLevel: 'loose' } @@ -433,7 +433,7 @@ flowchart TD { htmlLabels: true, flowchart: { htmlLabels: true }, securityLevel: 'loose' } ); }); - it('63: title on subgraphs should be themable', () => { + it('63: title on subgraphs should be themeable', () => { imgSnapshotTest( ` %%{init:{"theme":"base", "themeVariables": {"primaryColor":"#411d4e", "titleColor":"white", "darkMode":true}}}%% @@ -699,7 +699,7 @@ A --> B { flowchart: { titleTopMargin: 10 } } ); }); - it('3192: It should be possieble to render flowcharts with invisible edges', () => { + it('3192: It should be possible to render flowcharts with invisible edges', () => { imgSnapshotTest( `--- title: Simple flowchart with invisible edges @@ -1076,11 +1076,11 @@ end ); }); }); - describe('New @ sytax for node metadata edge cases', () => { + describe('New @ syntax for node metadata edge cases', () => { it('should be possible to use @ syntax to add labels on multi nodes', () => { imgSnapshotTest( `flowchart TB - n2["label for n2"] & n4@{ label: "labe for n4"} & n5@{ label: "labe for n5"} + n2["label for n2"] & n4@{ label: "label for n4"} & n5@{ label: "label for n5"} `, {} ); @@ -1088,7 +1088,7 @@ end it('should be possible to use @ syntax to add labels with trail spaces and &', () => { imgSnapshotTest( `flowchart TB - n2["label for n2"] & n4@{ label: "labe for n4"} & n5@{ label: "labe for n5"} + n2["label for n2"] & n4@{ label: "label for n4"} & n5@{ label: "label for n5"} `, {} ); @@ -1097,8 +1097,8 @@ end imgSnapshotTest( `flowchart TB n2["label for n2"] - n4@{ label: "labe for n4"} - n5@{ label: "labe for n5"} + n4@{ label: "label for n4"} + n5@{ label: "label for n5"} `, {} ); diff --git a/cypress/integration/rendering/gantt.spec.js b/cypress/integration/rendering/gantt.spec.js index 1ca17e480..2cc67918c 100644 --- a/cypress/integration/rendering/gantt.spec.js +++ b/cypress/integration/rendering/gantt.spec.js @@ -117,7 +117,7 @@ describe('Gantt diagram', () => { {} ); }); - it('should FAIL redering a gantt chart for issue #1060 with invalid date', () => { + it('should FAIL rendering a gantt chart for issue #1060 with invalid date', () => { imgSnapshotTest( ` gantt @@ -590,7 +590,7 @@ describe('Gantt diagram', () => { ` ); }); - it('should render a gantt diagram exculding friday and saturday', () => { + it('should render a gantt diagram excluding friday and saturday', () => { imgSnapshotTest( `gantt title A Gantt Diagram @@ -601,7 +601,7 @@ describe('Gantt diagram', () => { A task :a1, 2024-02-28, 10d` ); }); - it('should render a gantt diagram exculding saturday and sunday', () => { + it('should render a gantt diagram excluding saturday and sunday', () => { imgSnapshotTest( `gantt title A Gantt Diagram @@ -688,7 +688,7 @@ describe('Gantt diagram', () => { title Gantt Digram dateFormat YYYY-MM-DD section Section - ;A task with a semiclon :a1, 2014-01-01, 30d + ;A task with a semicolon :a1, 2014-01-01, 30d Another task :after a1 , 20d section Another Task in sec :2014-01-12 , 12d diff --git a/cypress/integration/rendering/gitGraph.spec.js b/cypress/integration/rendering/gitGraph.spec.js index 249febd08..42dc57439 100644 --- a/cypress/integration/rendering/gitGraph.spec.js +++ b/cypress/integration/rendering/gitGraph.spec.js @@ -11,7 +11,7 @@ describe('Git Graph diagram', () => { {} ); }); - it('2: should render a simple gitgraph with commit on main branch with Id', () => { + it('2: should render a simple gitgraph with commit on main branch with id', () => { imgSnapshotTest( `gitGraph commit id: "One" @@ -253,7 +253,7 @@ describe('Git Graph diagram', () => { ` gitGraph checkout main - %% Make sure to manually set the ID of all commits, for consistent visual tests + %% Make sure to manually set the id of all commits, for consistent visual tests commit id: "1-abcdefg" checkout main branch branch1 @@ -343,7 +343,7 @@ gitGraph {} ); }); - it('16: should render a simple gitgraph with commit on main branch with Id | Vertical Branch', () => { + it('16: should render a simple gitgraph with commit on main branch with id | Vertical Branch', () => { imgSnapshotTest( `gitGraph TB: commit id: "One" @@ -585,7 +585,7 @@ gitGraph ` gitGraph TB: checkout main - %% Make sure to manually set the ID of all commits, for consistent visual tests + %% Make sure to manually set the id of all commits, for consistent visual tests commit id: "1-abcdefg" checkout main branch branch1 @@ -1024,7 +1024,7 @@ gitGraph TB: {} ); }); - it('51: should render a simple gitgraph with commit on main branch with Id | Vertical Branch - Bottom-to-top', () => { + it('51: should render a simple gitgraph with commit on main branch with id | Vertical Branch - Bottom-to-top', () => { imgSnapshotTest( `gitGraph BT: commit id: "One" @@ -1266,7 +1266,7 @@ gitGraph TB: ` gitGraph BT: checkout main - %% Make sure to manually set the ID of all commits, for consistent visual tests + %% Make sure to manually set the id of all commits, for consistent visual tests commit id: "1-abcdefg" checkout main branch branch1 @@ -1491,7 +1491,7 @@ gitGraph TB: ` gitGraph switch main - %% Make sure to manually set the ID of all commits, for consistent visual tests + %% Make sure to manually set the id of all commits, for consistent visual tests commit id: "1-abcdefg" switch main branch branch1 diff --git a/cypress/integration/rendering/kanban.spec.ts b/cypress/integration/rendering/kanban.spec.ts index 6293776d6..0ff564cc6 100644 --- a/cypress/integration/rendering/kanban.spec.ts +++ b/cypress/integration/rendering/kanban.spec.ts @@ -62,7 +62,7 @@ describe('Kanban diagram', () => { {} ); }); - it('6: should handle assigments', () => { + it('6: should handle assignments', () => { imgSnapshotTest( `kanban id1[Todo] @@ -118,7 +118,7 @@ kanban docs[Create Documentation] docs[Create Blog about the new diagram] id7[In progress] - id6[Create renderer so that it works in all cases. We also add som extra text here for testing purposes. And some more just for the extra flare.] + id6[Create renderer so that it works in all cases. We also add some extra text here for testing purposes. And some more just for the extra flare.] id8[Design grammar]@{ assigned: 'knsv' } id9[Ready for deploy] id10[Ready for test] diff --git a/cypress/integration/rendering/mindmap.spec.ts b/cypress/integration/rendering/mindmap.spec.ts index a77459f58..731f861ee 100644 --- a/cypress/integration/rendering/mindmap.spec.ts +++ b/cypress/integration/rendering/mindmap.spec.ts @@ -146,7 +146,7 @@ root shouldHaveRoot ); }); - it('text shouhld wrap with icon', () => { + it('text should wrap with icon', () => { imgSnapshotTest( `mindmap root diff --git a/cypress/integration/rendering/pie.spec.ts b/cypress/integration/rendering/pie.spec.ts index 4a1d774c0..171a83057 100644 --- a/cypress/integration/rendering/pie.spec.ts +++ b/cypress/integration/rendering/pie.spec.ts @@ -64,7 +64,7 @@ describe('pie chart', () => { }); }); - it('should render a pie diagram when textPosition is setted', () => { + it('should render a pie diagram when textPosition is set', () => { imgSnapshotTest( `pie "Dogs": 50 diff --git a/cypress/integration/rendering/quadrantChart.spec.js b/cypress/integration/rendering/quadrantChart.spec.js index 4830db656..3a1e768aa 100644 --- a/cypress/integration/rendering/quadrantChart.spec.js +++ b/cypress/integration/rendering/quadrantChart.spec.js @@ -45,7 +45,7 @@ describe('Quadrant Chart', () => { {} ); }); - it('should able to render y-axix on right side', () => { + it('should able to render y-axis on right side', () => { imgSnapshotTest( ` %%{init: {"quadrantChart": {"yAxisPosition": "right"}}}%% @@ -61,7 +61,7 @@ describe('Quadrant Chart', () => { {} ); }); - it('should able to render x-axix on bottom', () => { + it('should able to render x-axis on bottom', () => { imgSnapshotTest( ` %%{init: {"quadrantChart": {"xAxisPosition": "bottom"}}}%% @@ -77,7 +77,7 @@ describe('Quadrant Chart', () => { {} ); }); - it('should able to render x-axix on bottom and y-axis on right', () => { + it('should able to render x-axis on bottom and y-axis on right', () => { imgSnapshotTest( ` %%{init: {"quadrantChart": {"xAxisPosition": "bottom", "yAxisPosition": "right"}}}%% diff --git a/cypress/integration/rendering/stateDiagram-v2.spec.js b/cypress/integration/rendering/stateDiagram-v2.spec.js index 606a1a3f5..83190dbc7 100644 --- a/cypress/integration/rendering/stateDiagram-v2.spec.js +++ b/cypress/integration/rendering/stateDiagram-v2.spec.js @@ -138,8 +138,8 @@ describe('State diagram', () => { imgSnapshotTest( ` stateDiagram-v2 - State1: This a a single line description - State2: This a a multi line description + State1: This a single line description + State2: This a multi line description State2: here comes the multi part [*] --> State1 State1 --> State2 @@ -345,7 +345,7 @@ stateDiagram } ); }); - it('v2 width of compond state should grow with title if title is wider', () => { + it('v2 width of compound state should grow with title if title is wider', () => { imgSnapshotTest( ` stateDiagram-v2 @@ -402,8 +402,8 @@ stateDiagram-v2 ` stateDiagram-v2 MyState - note left of MyState : I am a leftie - note right of MyState : I am a rightie + note left of MyState : I am a lefty + note right of MyState : I am a righty `, { logLevel: 0, @@ -552,7 +552,7 @@ style AState fill:#636,border:1px solid red,color:white; { logLevel: 0, fontFamily: 'courier' } ); }); - it(' should let styles take preceedence over classes', () => { + it(' should let styles take precedence over classes', () => { imgSnapshotTest( ` stateDiagram-v2 @@ -565,7 +565,7 @@ style AState fill:#636,border:1px solid red,color:white; { logLevel: 0, fontFamily: 'courier' } ); }); - it(' should allow styles to take effect in stubgraphs', () => { + it(' should allow styles to take effect in subgraphs', () => { imgSnapshotTest( ` stateDiagram diff --git a/cypress/integration/rendering/stateDiagram.spec.js b/cypress/integration/rendering/stateDiagram.spec.js index 9be1f2322..b4c5fa8c1 100644 --- a/cypress/integration/rendering/stateDiagram.spec.js +++ b/cypress/integration/rendering/stateDiagram.spec.js @@ -129,8 +129,8 @@ describe('State diagram', () => { imgSnapshotTest( ` stateDiagram - State1: This a a single line description - State2: This a a multi line description + State1: This a single line description + State2: This a multi line description State2: here comes the multi part [*] --> State1 State1 --> State2 diff --git a/cypress/integration/rendering/timeline.spec.ts b/cypress/integration/rendering/timeline.spec.ts index c748b54d3..dc6fab364 100644 --- a/cypress/integration/rendering/timeline.spec.ts +++ b/cypress/integration/rendering/timeline.spec.ts @@ -7,7 +7,7 @@ describe('Timeline diagram', () => { title History of Social Media Platform 2002 : LinkedIn 2004 : Facebook : Google - 2005 : Youtube + 2005 : YouTube 2006 : Twitter `, {} @@ -35,7 +35,7 @@ describe('Timeline diagram', () => { section Stone Age 7600 BC : Britain's oldest known house was built in Orkney, Scotland 6000 BC : Sea levels rise and Britain becomes an island.
The people who live here are hunter-gatherers. - section Broze Age + section Bronze Age 2300 BC : People arrive from Europe and settle in Britain.
They bring farming and metalworking. : New styles of pottery and ways of burying the dead appear. 2200 BC : The last major building works are completed at Stonehenge.
People now bury their dead in stone circles. @@ -51,7 +51,7 @@ describe('Timeline diagram', () => { title History of Social Media Platform 2002 : LinkedIn 2004 : Facebook : Google - 2005 : Youtube + 2005 : YouTube 2006 : Twitter `, {} @@ -68,7 +68,7 @@ describe('Timeline diagram', () => { title History of Social Media Platform 2002 : LinkedIn 2004 : Facebook : Google - 2005 : Youtube + 2005 : YouTube 2006 : Twitter 2007 : Tumblr 2008 : Instagram @@ -84,7 +84,7 @@ describe('Timeline diagram', () => { title History of Social Media Platform 2002 : LinkedIn 2004 : Facebook : Google - 2005 : Youtube + 2005 : YouTube 2006 : Twitter 2007 : Tumblr 2008 : Instagram @@ -101,7 +101,7 @@ describe('Timeline diagram', () => { title History of Social Media Platform 2002 : LinkedIn 2004 : Facebook : Google - 2005 : Youtube + 2005 : YouTube 2006 : Twitter 2007 : Tumblr 2008 : Instagram @@ -118,7 +118,7 @@ describe('Timeline diagram', () => { title History of Social Media Platform 2002 : LinkedIn 2004 : Facebook : Google - 2005 : Youtube + 2005 : YouTube 2006 : Twitter 2007 : Tumblr 2008 : Instagram @@ -135,7 +135,7 @@ describe('Timeline diagram', () => { title History of Social Media Platform 2002 : LinkedIn 2004 : Facebook : Google - 2005 : Youtube + 2005 : YouTube 2006 : Twitter 2007 : Tumblr 2008 : Instagram @@ -152,7 +152,7 @@ describe('Timeline diagram', () => { title History of Social Media Platform 2002 : LinkedIn 2004 : Facebook : Google - 2005 : Youtube + 2005 : YouTube 2006 : Twitter 2007 : Tumblr 2008 : Instagram diff --git a/cypress/platform/ashish2.html b/cypress/platform/ashish2.html index 351dcabc2..30584295d 100644 --- a/cypress/platform/ashish2.html +++ b/cypress/platform/ashish2.html @@ -60,7 +60,7 @@
  timeline
         title My day
-        section section with no tasks
+        section Section with no tasks
         section Go to work at the dog office
           1930 : first step : second step is a long step
                : third step
@@ -70,18 +70,18 @@
           1960 : India fights poverty, looses war to China and gets nuclear weapons from USA and USSR
           1970 : Green Revolution comes to india
         section Another section with no tasks
-          I am a big big big tasks
-          I am not so big tasks
+          I am a very, very big task
+          I am not so big task
     
  timeline
         title MermaidChart 2023 Timeline
         section 2023 Q1 
Release Personal Tier - Buttet 1 : sub-point 1a : sub-point 1b + Bullet 1 : sub-point 1a : sub-point 1b : sub-point 1c Bullet 2 : sub-point 2a : sub-point 2b section 2023 Q2
Release XYZ Tier - Buttet 3 : sub-point
3a : sub-point 3b + Bullet 3 : sub-point
3a : sub-point 3b : sub-point 3c Bullet 4 : sub-point 4a : sub-point 4b @@ -93,7 +93,7 @@ section Stone Age 7600 BC : Britain's oldest known house was built in Orkney, Scotland 6000 BC : Sea levels rise and Britain becomes an island. The people who live here are hunter-gatherers. - section Broze Age + section Bronze Age 2300 BC : People arrive from Europe and settle in Britain. They bring farming and metalworking. : New styles of pottery and ways of burying the dead appear. 2200 BC : The last major building works are completed at Stonehenge. People now bury their dead in stone circles. @@ -106,7 +106,7 @@ title History of Social Media Platform 2002 : LinkedIn 2004 : Facebook : Google : Pixar - 2005 : Youtube + 2005 : YouTube 2006 : Twitter 2007 : Tumblr 2008s : Instagram @@ -122,7 +122,7 @@ title History of Social Media Platform 2002 : LinkedIn 2004 : Facebook : Google : Pixar - 2005 : Youtube + 2005 : YouTube 2006 : Twitter 2007 : Tumblr 2008s : Instagram @@ -139,7 +139,7 @@ title History of Social Media Platform 2002 : LinkedIn 2004 : Facebook : Google - 2005 : Youtube + 2005 : YouTube 2006 : Twitter 2007 : Tumblr 2008 : Instagram @@ -152,7 +152,7 @@ title History of Social Media Platform 2002 : LinkedIn 2004 : Facebook : Google - 2005 : Youtube + 2005 : YouTube 2006 : Twitter 2007 : Tumblr 2008s : Instagram diff --git a/cypress/platform/class.html b/cypress/platform/class.html index edf74e1b6..b649d1184 100644 --- a/cypress/platform/class.html +++ b/cypress/platform/class.html @@ -37,7 +37,7 @@ +String owner +BigDecimal balance +deposit(amount) bool - +withdrawl(amount) int + +withdrawal(amount) int } cssClass "BankAccount" customCss @@ -56,7 +56,7 @@ classE o-- classF : aggregation +String owner +BigDecimal balance +deposit(amount) bool - +withdrawl(amount) int + +withdrawal(amount) int } Class01~T~ <|-- AveryLongClass : Cool Class03~T~ *-- Class04~T~ diff --git a/cypress/platform/click_security_other.html b/cypress/platform/click_security_other.html index 11fd806ec..e9a4b2da5 100644 --- a/cypress/platform/click_security_other.html +++ b/cypress/platform/click_security_other.html @@ -77,7 +77,7 @@ document.getElementsByTagName('body')[0].appendChild(div); } - mermaid.initialize({ startOnLoad: true, securityLevel: 'strct', logLevel: 1 }); + mermaid.initialize({ startOnLoad: true, securityLevel: 'strict_', logLevel: 1 }); diff --git a/cypress/platform/current.html b/cypress/platform/current.html index 365986c02..6502fe1e8 100644 --- a/cypress/platform/current.html +++ b/cypress/platform/current.html @@ -31,7 +31,7 @@ flowchart BT subgraph S1 sub1 -->sub2 end subgraph S2 sub4 end S1 --> S2 sub1 --> sub4
- sequenceDiagram Alice->>Bob:Extremely utterly long line of longness which had preivously + sequenceDiagram Alice->>Bob:Extremely utterly long line of longness which had previously overflown the actor box as it is much longer than what it should be Bob->>Alice: I'm short though
@@ -61,9 +61,9 @@ #quot;elit#quot;."}}
- flowchart TB internet nat routeur lb1 lb2 compute1 compute2 subgraph project routeur nat - subgraph subnet1 compute1 lb1 end subgraph subnet2 compute2 lb2 end end internet --> routeur - routeur --> subnet1 & subnet2 subnet1 & subnet2 --> nat --> internet + flowchart TB internet nat router lb1 lb2 compute1 compute2 subgraph project router nat + subgraph subnet1 compute1 lb1 end subgraph subnet2 compute2 lb2 end end internet --> router + router --> subnet1 & subnet2 subnet1 & subnet2 --> nat --> internet
flowchart TD subgraph one[One] subgraph sub_one[Sub One] _sub_one end end subgraph two[Two] diff --git a/cypress/platform/e2e.html b/cypress/platform/e2e.html index d80caf7a4..465fbfbf5 100644 --- a/cypress/platform/e2e.html +++ b/cypress/platform/e2e.html @@ -7,7 +7,7 @@ rel="stylesheet" />