GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity
6,769 Commits 182 Branches 159 Tags
Commit Graph

660 Commits

Author SHA1 Message Date
Olivier Leveau
9fb6f1998f Merge branch 'develop' into feature/AddBoxForSeqDiagrams 2023-01-26 09:14:18 +01:00
Sidharth Vinod
c51f6df82c
Merge pull request #4030 from tomperr/feature/4009_er_multiple_constraints 
feat(er): add multiple key constraints
 2023-01-26 00:16:58 +05:30
Tom PERRILLAT-COLLOMB
dc0a46f742 test(er): improve tests on multiple key constraints 2023-01-25 19:40:40 +01:00
Sidharth Vinod
c76728b423
Merge pull request #3902 from weedySeaDragon/bug/3858_state_named_state_container 
Bug/3858 [state] trailing whitespace in ids for named state container
 2023-01-25 22:51:34 +05:30
Sidharth Vinod
0aa7da261f
Merge pull request #3962 from aloisklink/build/add-autogenerated-header-after-yaml-codeblocks 
Add support for YAML frontmatter in Markdown docs (used for Vitepress config)
 2023-01-25 22:50:20 +05:30
Olivier Leveau
f7756ccc00 Fixes Typo, remove console.log 2023-01-25 17:02:10 +01:00
Tom PERRILLAT-COLLOMB
3066a4b43a doc(er): add documentation on multiple key constraints 2023-01-25 15:13:58 +01:00
Tom PERRILLAT-COLLOMB
26e9b1790b feat(er): allow multiple constraints on attributes 
little changes in grammar to get a list of constraints (PK, FK or UK), so little changes in renderer to handle this list
 2023-01-24 21:20:11 +01:00
Sidharth Vinod
6792bb94b7
chore: Use logger 2023-01-24 16:11:04 +05:30
Sidharth Vinod
b36e5d0d3b
fix: Remove unnecessary void's. 
Co-authored-by: Alois Klink <alois@aloisklink.com>
 2023-01-24 16:08:43 +05:30
Sidharth Vinod
a28f6bf80c
Merge branch 'develop' into sidv/fixUnhandledPromise 
* develop:
  chore: Skip 57-elk test
  Update docs
  Update integrations.md
 2023-01-24 16:00:35 +05:30
Alois Klink
816f2f512e build(docs): hide YAML when building for GitHub 
YAML front-matter is currently only used for Vitepress.

Because of that, to avoid confusion, we can remove this YAML
front-matter when converting the Markdown in packages/mermaid/src/docs
to go into the `docs/` folder for GitHub browsing.
 2023-01-22 19:23:57 +00:00
Alois Klink
76c3716b2d docs: add vitepress metadata to flowchart docs 
Changes the title in Vitepress, as well as using `outline: "deep"`
for a better outline/table-of-contents for the page.

See https://vitepress.vuejs.org/config/theme-configs#outline
for docs on what `outline: "deep"` does.
 2023-01-22 19:21:53 +00:00
Alois Klink
2f1a521db6 build(docs): add auto-generated header after YAML 
Add the auto-generated header after any YAML front-matter blocks.

YAML front-matter is normally only valid in Markdown when it's at the
beginning of the Markdown file. GitHub/Vitepress may otherwise render
it incorrectly.
 2023-01-22 19:21:53 +00:00
Alois Klink
8f4caa4537 refactor(docs): use remark-compatible plugin 
Change the `transformBlocks` function, which transforms a markdown str,
and instead making it into a
`transformMarkdownAst` function, which transforms a Markdown AST.

This means we can use the remark/unifiedjs plugin infrastructure, see
https://unifiedjs.com/learn/guide/create-a-plugin/
 2023-01-22 19:21:51 +00:00
Alois Klink
b26cdb3e46 build(docs): support YAML frontmatter in markdown 
Vitepress uses YAML frontmatter to configure Vitepress specific
settings, see https://vitepress.vuejs.org/config/frontmatter-configs

We just need to use `remark-frontmatter` to add support for it.

GitHub also renders the YAML front-matter nicely in a table
automatically, but maybe we should instead strip it, if it's only
used by Vitepress?
 2023-01-22 19:21:18 +00:00
Bastian Ebeling
3aeef7b846
Update integrations.md 
Corrected `Vs Code` to `VS Code` and inserted `Markdown Preview Enhanced`
 2023-01-19 07:15:32 +01:00
Olivier Leveau
250f1f9687 Merge branch 'develop' into feature/AddBoxForSeqDiagrams 2023-01-18 11:35:39 +01:00
Sidharth Vinod
5b9839cbd0
fix package.json 
add `@types/cytoscape`
 2023-01-18 00:53:00 +05:30
Sidharth Vinod
afe3f593e1
fix(#4003): Remove unhandled promises 
Add eslint rules to check for unhandled promises
Fix all existing unhandled promise issues
 2023-01-18 00:47:49 +05:30
Sidharth Vinod
8a485c3c88
Merge pull request #3993 from jonabc/bug/sequence-firefox-font-size 
Parse style string and number font size values from configuration inputs
 2023-01-17 22:07:11 +05:30
Jon Ruskin
9629c8d8d6 use undefined not null 2023-01-17 08:31:36 -07:00
Sidharth Vinod
c0f9b3c00b
Merge branch 'develop' into sidv/internalFCV3 
* develop:
  Update docs
  docs(sequenceDiagram): subvert prettification of arrow types
 2023-01-17 14:07:12 +05:30
Sidharth Vinod
3c12e66f73
Merge pull request #3988 from cakemanny/docs/correct-arrow-type-display 
docs(sequenceDiagram): subvert prettification of arrow types
 2023-01-16 15:18:59 +05:30
renovate[bot]
ea3d7bc594 fix(deps): update dependency dagre-d3-es to v7.0.6 2023-01-16 05:18:31 +00:00
Sidharth Vinod
1c8c69f8db
Merge branch 'sidv/properlyWaitTests' into sidv/internalFCV3 
* sidv/properlyWaitTests:
  feat: Wait for rendering to finish before taking image snapshots
  Update docs
  chore(deps): update all non-major dependencies
  Fix: Too many `primaryBorderColor`
 2023-01-16 02:11:59 +05:30
Jon Ruskin
b93ce24c3d handle string and number font size configurations 2023-01-14 14:05:05 -07:00
Daniel Golding
0a4a3bda16
docs(sequenceDiagram): subvert prettification of arrow types 
The rendering of the arrows becomes prettified using some sort of font library on mermaid.js.org .
Quote in backticks to indicate these are code.
 2023-01-13 17:05:53 +01:00
Howard He
e44e1210e2
Fix: Too many primaryBorderColor 
Only keep one `primaryBorderColor` field in Theme Variables part.
before:
![before](https://s2.loli.net/2023/01/13/I657QWjsAlVokfE.png)
after:
![after](https://s2.loli.net/2023/01/13/ZQ7PSfcdIKBtGsm.png)
 2023-01-13 17:13:56 +08:00
Sidharth Vinod
05d1fc44e8
Merge branch 'develop' into sidv/internalFCV3 
* develop:
  test(sequenceDiagram): mock more d3 curve* types
  test(docs): fix test failure due to bad merge
  chore(dev-deps): update vitest to `^0.27.1`
 2023-01-13 10:23:59 +05:30
Alois Klink
164b9bc2cb test(sequenceDiagram): mock more d3 curve* types 
vitest is throwing an error, since these types are used in
packages/mermaid/src/utils.ts, but are not being mocked.

I've added all the curve types I needed to make Vitest happy.
At some point, we may need to improve these mocks, since in d3,
they have the type CurveFactory, not string.
 2023-01-13 00:27:48 +00:00
Alois Klink
16540f3005 test(docs): fix test failure due to bad merge 
Fixes a semantic merge conflict due to the PRs:
  - https://github.com/mermaid-js/mermaid/pull/3954
    Changed `docs.mts` to use a remark object created by `remark()`
  - https://github.com/mermaid-js/mermaid/pull/3946
    Added test code that mocked the frozen remark object
    (e.g. `remark` not `remark()`).

To fix this issue, we can mock `remark()` so that it always returns
the same remark object, which can then be used the `docs.mts` script,
as well as spied on in the `docs.spec.ts` test file.

Reported-by: Sidharth Vinod <sidharthv96@gmail.com>
 2023-01-13 00:17:17 +00:00
Sidharth Vinod
242a508d50
feat: Flowchart-elk integration 2023-01-12 18:26:08 +05:30
Sidharth Vinod
9acd562b9e
Merge pull request #3954 from aloisklink/build/support-GFM-in-markdown-documentation 
Support GitHub Flavored Markdown in markdown documentation
 2023-01-12 12:47:07 +05:30
Sidharth Vinod
3238ee4c2e
Merge pull request #3972 from atmikeguo/develop 
Fix nonstandard syntax
 2023-01-12 12:44:03 +05:30
oleveau
7b5bebd9c4 Sanitize text of the box 2023-01-11 22:10:41 +01:00
Ashish Jain
b67c023b0a
Merge pull request #3938 from mermaid-js/layout-v3-continued 
Layout v3 continued
 2023-01-11 20:01:24 +01:00
Knut Sveidqvist
e28a766e7d Cleanup, updating the module name and description for flowchart in package.json 2023-01-11 19:56:04 +01:00
Knut Sveidqvist
3f7f04e02f Adjusted as per @ashishjain0512 review comments 2023-01-11 19:40:25 +01:00
Knut Sveidqvist
ce6f62e24e
Merge pull request #3946 from weedySeaDragon/chore/3922_doc-diagram-only 
(chore) Docs: add tag to produce only a diagram, not code example
 2023-01-11 18:04:41 +01:00
Knut Sveidqvist
094b97de12 Merge branch 'develop' into layout-v3-continued 2023-01-11 18:03:09 +01:00
Knut Sveidqvist
0e3dadc53c Updated as per the suggestions from @weedySeaDragon 2023-01-11 17:58:05 +01:00
Knut Sveidqvist
1fca5131c3
Merge pull request #3947 from nekikara/bug/3865_c4_context_border_color 
Bug/3865 C4Context: $borderColor has no effect
 2023-01-11 17:56:00 +01:00
renovate[bot]
a56d0bc36b fix(deps): update dependency dompurify to v2.4.3 2023-01-09 02:52:02 +00:00
Chidozie Nnachor
568a3329e1
docs: update sequenceDiagram.md to include line break (#3960) 
Included an example for adding a line break to notes. It seems like an issue irking a lot of (new) users

Co-authored-by: Alois Klink <alois@aloisklink.com>
Co-authored-by: Chidozie Nnachor <Chidozie.Nnachor@keylane.com>
 2023-01-07 23:39:36 +00:00
atmikeguo
1968d1bb28 Fix nonstandard syntax 2023-01-07 20:05:57 +08:00
Olivier Leveau
117f0ab6da Fix test / Add Tests 2023-01-06 13:38:03 +01:00
Olivier Leveau
64a935515c Better color detection + fix win32 path handling 2023-01-06 12:47:09 +01:00
Olivier Leveau
e6befbaa3f Merge branch 'develop' into feature/AddBoxForSeqDiagrams 2023-01-06 11:06:00 +01:00
Olivier Leveau
e659601e03 Add Box support in Sequence Diagrams 2023-01-05 15:40:40 +01:00