Skip to content

Commit

Permalink
Merge branch 'develop' into release/10.6.2
Browse files Browse the repository at this point in the history
* develop: (24 commits)
  chore: Minor cleanup of imperativeState
  add jetbrains blog post
  additional updates
  update latest news pages
  fix addl broken link
  fix link
  build: use `tsx` instead of `ts-node-esm`
  verbiage updates
  fix: replace functional approaches with oop
  feat: Track outbound links in plausible
  update getting started page
  add blog post
  chore: Update promo link
  docs: Holiday promo v2
  Update packages/mermaid/src/docs/.vitepress/components/TopBar.vue
  update announcements page
  update announcement bar verbiage
  chore: fix autogen docs
  chore(sequence): Update packages/mermaid/src/docs/syntax/sequenceDiagram.md
  chore(sequence): update doc for actors/participant creation/deletion fix
  ...
  • Loading branch information
sidharthv96 committed Jan 11, 2024
2 parents 977a3f2 + 1d4bb50 commit 26bab80
Show file tree
Hide file tree
Showing 21 changed files with 728 additions and 247 deletions.
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
registry=https://registry.npmjs.org
auto-install-peers=true
strict-peer-dependencies=false
6 changes: 3 additions & 3 deletions cypress/helpers/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interface CypressConfig {
type CypressMermaidConfig = MermaidConfig & CypressConfig;

interface CodeObject {
code: string;
code: string | string[];
mermaid: CypressMermaidConfig;
}

Expand All @@ -25,7 +25,7 @@ const batchId: string =
: Cypress.env('CYPRESS_COMMIT') || Date.now().toString());

export const mermaidUrl = (
graphStr: string,
graphStr: string | string[],
options: CypressMermaidConfig,
api: boolean
): string => {
Expand Down Expand Up @@ -82,7 +82,7 @@ export const urlSnapshotTest = (
};

export const renderGraph = (
graphStr: string,
graphStr: string | string[],
options: CypressMermaidConfig = {},
api = false
): void => {
Expand Down
32 changes: 32 additions & 0 deletions cypress/integration/rendering/sequencediagram.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -930,4 +930,36 @@ context('Sequence diagram', () => {
});
});
});
context('render after error', () => {
it('should render diagram after fixing destroy participant error', () => {
cy.on('uncaught:exception', (err) => {
return false;
});

renderGraph([
`sequenceDiagram
Alice->>Bob: Hello Bob, how are you ?
Bob->>Alice: Fine, thank you. And you?
create participant Carl
Alice->>Carl: Hi Carl!
create actor D as Donald
Carl->>D: Hi!
destroy Carl
Alice-xCarl: We are too many
destroy Bo
Bob->>Alice: I agree`,
`sequenceDiagram
Alice->>Bob: Hello Bob, how are you ?
Bob->>Alice: Fine, thank you. And you?
create participant Carl
Alice->>Carl: Hi Carl!
create actor D as Donald
Carl->>D: Hi!
destroy Carl
Alice-xCarl: We are too many
destroy Bob
Bob->>Alice: I agree`,
]);
});
});
});
26 changes: 18 additions & 8 deletions docs/ecosystem/integrations-community.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,26 @@
# Integrations

## Official integration: [Mermaid Chart](./mermaid-chart.md)
## Official integration

We're excited about the growth of the Mermaid community, and the number of plugins and integrations that have been created with Mermaid.
### Mermaid Chart

Mermaid Chart is built by the team behind Mermaid JS.

For more details, visit the [Mermaid Chart page](./mermaid-chart.md), or visit the [Mermaid Chart website](https://www.mermaidchart.com) .

## Community integrations

Below are a list of community plugins and integrations created with Mermaid.
We're excited about the growth of the Mermaid community, and the number of plugins and integrations that have been created by the community.

### Productivity tools
See the list below of community plugins and integrations created with Mermaid.

✅ = Native support
> **Note**
> A ✅ indicates Native support for Mermaid on the respective platform.
To add an integration to this list, see the [Integrations - create page](./integrations-create.md).

### Productivity tools

- [GitHub](https://github.com)
- [Using code blocks](https://github.blog/2022-02-14-include-diagrams-markdown-files-mermaid/)
Expand Down Expand Up @@ -198,13 +207,14 @@ Communication tools and platforms
- [mkdocs-material](https://github.com/squidfunk/mkdocs-material), check the [docs](https://squidfunk.github.io/mkdocs-material/reference/diagrams/)
- [Type Doc](https://typedoc.org/)
- [typedoc-plugin-mermaid](https://www.npmjs.com/package/typedoc-plugin-mermaid)
- [Docsy Hugo Theme](https://www.docsy.dev/docs/adding-content/lookandfeel/#diagrams-with-mermaid) (native support in theme)
- [Docsy Hugo Theme](https://www.docsy.dev/docs/adding-content/lookandfeel/#diagrams-with-mermaid)
- [Codedoc](https://codedoc.cc/)
- [codedoc-mermaid-plugin](https://www.npmjs.com/package/codedoc-mermaid-plugin)
- [mdbook](https://rust-lang.github.io/mdBook/index.html)
- [mdbook-mermaid](https://github.com/badboy/mdbook-mermaid)
- [Quarto](https://quarto.org/)
- [Typora](https://typora.io/) ([native support](https://support.typora.io/Draw-Diagrams-With-Markdown/#mermaid))
- [Typora](https://typora.io/)
- [See docs](https://support.typora.io/Draw-Diagrams-With-Markdown/#mermaid)

### Browser Extensions

Expand Down Expand Up @@ -236,6 +246,6 @@ Communication tools and platforms
- [mermaid-server: Generate diagrams using a HTTP request](https://github.com/TomWright/mermaid-server)
- [ExDoc](https://github.com/elixir-lang/ex_doc)
- [Rendering Mermaid graphs](https://github.com/elixir-lang/ex_doc#rendering-mermaid-graphs)
- [NiceGUI: Let any browser be the frontend of your Python code](https://nicegui.io)
- [NiceGUI: Let any browser be the frontend of your Python code](https://nicegui.io)
- [ui.mermaid(...)](https://nicegui.io/documentation/section_text_elements#markdown_element)
- [ui.markdown(..., extras=\['mermaid'\])](https://nicegui.io/documentation/section_text_elements#mermaid_diagrams)
13 changes: 10 additions & 3 deletions docs/ecosystem/mermaid-chart.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,16 @@

- **Collaboration** - A web based collaboration feature for multi-user editing on Mermaid diagrams in real-time (Pro plan).

- **Plugins** - A plugin system for extending the functionality of Mermaid. Currently includes [VS Code](https://marketplace.visualstudio.com/items?itemName=MermaidChart.vscode-mermaid-chart) and [ChatGPT](https://www.mermaidchart.com/plugins/chatgpt).
- **Plugins** - A plugin system for extending the functionality of Mermaid.

- **AI** - An AI chatbot that can generate Mermaid diagrams from text (Pro plan).
Plugins are available for:

- [ChatGPT](https://docs.mermaidchart.com/plugins/chatgpt)
- [JetBrains IDE](https://plugins.jetbrains.com/plugin/23043-mermaid-chart)
- [Microsoft PowerPoint and Word](https://appsource.microsoft.com/en-us/product/office/WA200006214?tab=Overview)
- [Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=MermaidChart.vscode-mermaid-chart)

- **AI diagramming** - A feature for generating Mermaid diagrams from text using AI (Pro plan).

- **More** - To learn more, visit our [Product](https://www.mermaidchart.com/product) page.

Expand All @@ -40,7 +47,7 @@

Sign up for a free account at [Mermaid Chart](https://www.mermaidchart.com/app/sign-up).

Mermaid Chart is currently offering a 30-day free trial of our newly-launched Pro tier. To learn more, visit our [Pricing](https://mermaidchart.com/pricing) page.
Mermaid Chart is currently offering a 14-day free trial of our newly-launched Pro tier. To learn more, visit our [Pricing](https://mermaidchart.com/pricing) page.

## Mermaid JS contributions

Expand Down
Loading

0 comments on commit 26bab80

Please sign in to comment.