Merge branch 'master' into update-latest-news
This commit is contained in:
commit
1f7aec7405
|
@ -29,7 +29,7 @@ jobs:
|
||||||
- name: Install Packages
|
- name: Install Packages
|
||||||
run: pnpm install --frozen-lockfile
|
run: pnpm install --frozen-lockfile
|
||||||
|
|
||||||
- name: Verify release verion
|
- name: Verify release version
|
||||||
if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release')) }}
|
if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release')) }}
|
||||||
run: pnpm --filter mermaid run docs:verify-version
|
run: pnpm --filter mermaid run docs:verify-version
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@ Mermaid addresses this problem by enabling users to create easily modifiable dia
|
||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
Mermaid allows even non-programmers to easily create detailed diagrams through the [Mermaid Live Editor](https://mermaid.live/).<br/>
|
Mermaid allows even non-programmers to easily create detailed diagrams through the [Mermaid Live Editor](https://mermaid.live/).<br/>
|
||||||
[Tutorials](./docs/config/Tutorials.md) has video tutorials.
|
For video tutorials, visit our [Tutorials](./docs/config/Tutorials.md) page.
|
||||||
Use Mermaid with your favorite applications, check out the list of [Integrations and Usages of Mermaid](./docs/ecosystem/integrations-community.md).
|
Use Mermaid with your favorite applications, check out the list of [Integrations and Usages of Mermaid](./docs/ecosystem/integrations-community.md).
|
||||||
|
|
||||||
You can also use Mermaid within [GitHub](https://github.blog/2022-02-14-include-diagrams-markdown-files-mermaid/) as well many of your other favorite applications—check out the list of [Integrations and Usages of Mermaid](./docs/ecosystem/integrations-community.md).
|
You can also use Mermaid within [GitHub](https://github.blog/2022-02-14-include-diagrams-markdown-files-mermaid/) as well many of your other favorite applications—check out the list of [Integrations and Usages of Mermaid](./docs/ecosystem/integrations-community.md).
|
||||||
|
|
|
@ -35,6 +35,7 @@ Below are a list of community plugins and integrations created with Mermaid.
|
||||||
- [Notion](https://notion.so) ✅
|
- [Notion](https://notion.so) ✅
|
||||||
- [Observable](https://observablehq.com/@observablehq/mermaid) ✅
|
- [Observable](https://observablehq.com/@observablehq/mermaid) ✅
|
||||||
- [Obsidian](https://help.obsidian.md/Editing+and+formatting/Advanced+formatting+syntax#Diagram) ✅
|
- [Obsidian](https://help.obsidian.md/Editing+and+formatting/Advanced+formatting+syntax#Diagram) ✅
|
||||||
|
- [NotesHub](https://noteshub.app) ✅
|
||||||
- [GitBook](https://gitbook.com)
|
- [GitBook](https://gitbook.com)
|
||||||
- [Mermaid Plugin](https://github.com/JozoVilcek/gitbook-plugin-mermaid)
|
- [Mermaid Plugin](https://github.com/JozoVilcek/gitbook-plugin-mermaid)
|
||||||
- [Markdown with Mermaid CLI](https://github.com/miao1007/gitbook-plugin-mermaid-cli)
|
- [Markdown with Mermaid CLI](https://github.com/miao1007/gitbook-plugin-mermaid-cli)
|
||||||
|
@ -169,6 +170,7 @@ Communication tools and platforms
|
||||||
|
|
||||||
### Document Generation
|
### Document Generation
|
||||||
|
|
||||||
|
- [Docusaurus](https://docusaurus.io/docs/markdown-features/diagrams) ✅
|
||||||
- [Swimm - Up-to-date diagrams with Swimm, the knowledge management tool for code](https://docs.swimm.io/Features/diagrams-and-charts)
|
- [Swimm - Up-to-date diagrams with Swimm, the knowledge management tool for code](https://docs.swimm.io/Features/diagrams-and-charts)
|
||||||
- [Sphinx](https://www.sphinx-doc.org/en/master/)
|
- [Sphinx](https://www.sphinx-doc.org/en/master/)
|
||||||
- [sphinxcontrib-mermaid](https://github.com/mgaitan/sphinxcontrib-mermaid)
|
- [sphinxcontrib-mermaid](https://github.com/mgaitan/sphinxcontrib-mermaid)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
"version": "10.2.4",
|
"version": "10.2.4",
|
||||||
"description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
|
"description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"packageManager": "pnpm@8.9.2",
|
"packageManager": "pnpm@8.10.2",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"diagram",
|
"diagram",
|
||||||
"markdown",
|
"markdown",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "mermaid",
|
"name": "mermaid",
|
||||||
"version": "10.6.0",
|
"version": "10.6.1",
|
||||||
"description": "Markdown-ish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
|
"description": "Markdown-ish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"module": "./dist/mermaid.core.mjs",
|
"module": "./dist/mermaid.core.mjs",
|
||||||
|
|
|
@ -535,6 +535,10 @@ describe('[Text] when parsing', () => {
|
||||||
expect(vert['A'].text).toBe('this is an ellipse');
|
expect(vert['A'].text).toBe('this is an ellipse');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should not freeze when ellipse text has a `(`', function () {
|
||||||
|
expect(() => flow.parser.parse('graph\nX(- My Text (')).toThrowError();
|
||||||
|
});
|
||||||
|
|
||||||
it('should handle text in diamond vertices with space', function () {
|
it('should handle text in diamond vertices with space', function () {
|
||||||
const res = flow.parser.parse('graph TD;A(chimpansen hoppar)-->C;');
|
const res = flow.parser.parse('graph TD;A(chimpansen hoppar)-->C;');
|
||||||
|
|
||||||
|
|
|
@ -134,7 +134,7 @@ that id.
|
||||||
<*>\s*\~\~[\~]+\s* return 'LINK';
|
<*>\s*\~\~[\~]+\s* return 'LINK';
|
||||||
|
|
||||||
<ellipseText>[-/\)][\)] { this.popState(); return '-)'; }
|
<ellipseText>[-/\)][\)] { this.popState(); return '-)'; }
|
||||||
<ellipseText>[^\(\)\[\]\{\}]|-/!\)+ return "TEXT"
|
<ellipseText>[^\(\)\[\]\{\}]|-\!\)+ return "TEXT"
|
||||||
<*>"(-" { this.pushState("ellipseText"); return '(-'; }
|
<*>"(-" { this.pushState("ellipseText"); return '(-'; }
|
||||||
|
|
||||||
<text>"])" { this.popState(); return 'STADIUMEND'; }
|
<text>"])" { this.popState(); return 'STADIUMEND'; }
|
||||||
|
|
|
@ -33,6 +33,7 @@ Below are a list of community plugins and integrations created with Mermaid.
|
||||||
- [Notion](https://notion.so) ✅
|
- [Notion](https://notion.so) ✅
|
||||||
- [Observable](https://observablehq.com/@observablehq/mermaid) ✅
|
- [Observable](https://observablehq.com/@observablehq/mermaid) ✅
|
||||||
- [Obsidian](https://help.obsidian.md/Editing+and+formatting/Advanced+formatting+syntax#Diagram) ✅
|
- [Obsidian](https://help.obsidian.md/Editing+and+formatting/Advanced+formatting+syntax#Diagram) ✅
|
||||||
|
- [NotesHub](https://noteshub.app) ✅
|
||||||
- [GitBook](https://gitbook.com)
|
- [GitBook](https://gitbook.com)
|
||||||
- [Mermaid Plugin](https://github.com/JozoVilcek/gitbook-plugin-mermaid)
|
- [Mermaid Plugin](https://github.com/JozoVilcek/gitbook-plugin-mermaid)
|
||||||
- [Markdown with Mermaid CLI](https://github.com/miao1007/gitbook-plugin-mermaid-cli)
|
- [Markdown with Mermaid CLI](https://github.com/miao1007/gitbook-plugin-mermaid-cli)
|
||||||
|
@ -167,6 +168,7 @@ Communication tools and platforms
|
||||||
|
|
||||||
### Document Generation
|
### Document Generation
|
||||||
|
|
||||||
|
- [Docusaurus](https://docusaurus.io/docs/markdown-features/diagrams) ✅
|
||||||
- [Swimm - Up-to-date diagrams with Swimm, the knowledge management tool for code](https://docs.swimm.io/Features/diagrams-and-charts)
|
- [Swimm - Up-to-date diagrams with Swimm, the knowledge management tool for code](https://docs.swimm.io/Features/diagrams-and-charts)
|
||||||
- [Sphinx](https://www.sphinx-doc.org/en/master/)
|
- [Sphinx](https://www.sphinx-doc.org/en/master/)
|
||||||
- [sphinxcontrib-mermaid](https://github.com/mgaitan/sphinxcontrib-mermaid)
|
- [sphinxcontrib-mermaid](https://github.com/mgaitan/sphinxcontrib-mermaid)
|
||||||
|
|
|
@ -22,17 +22,17 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@iconify-json/carbon": "^1.1.16",
|
"@iconify-json/carbon": "^1.1.16",
|
||||||
"@unocss/reset": "^0.56.0",
|
"@unocss/reset": "^0.57.0",
|
||||||
"@vite-pwa/vitepress": "^0.2.0",
|
"@vite-pwa/vitepress": "^0.2.0",
|
||||||
"@vitejs/plugin-vue": "^4.2.1",
|
"@vitejs/plugin-vue": "^4.2.1",
|
||||||
"fast-glob": "^3.2.12",
|
"fast-glob": "^3.2.12",
|
||||||
"https-localhost": "^4.7.1",
|
"https-localhost": "^4.7.1",
|
||||||
"pathe": "^1.1.0",
|
"pathe": "^1.1.0",
|
||||||
"unocss": "^0.56.0",
|
"unocss": "^0.57.0",
|
||||||
"unplugin-vue-components": "^0.25.0",
|
"unplugin-vue-components": "^0.25.0",
|
||||||
"vite": "^4.3.9",
|
"vite": "^4.3.9",
|
||||||
"vite-plugin-pwa": "^0.16.0",
|
"vite-plugin-pwa": "^0.16.0",
|
||||||
"vitepress": "1.0.0-rc.22",
|
"vitepress": "1.0.0-rc.24",
|
||||||
"workbox-window": "^7.0.0"
|
"workbox-window": "^7.0.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
589
pnpm-lock.yaml
589
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue