mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
8,018 Commits 158 Branches 138 Tags 346 MiB
Commit Graph

8018 Commits

Author SHA1 Message Date
Alois Klink 4d2d790cc8 build(docs): handle YAML edgecases in markdown 
Our current method of adding a entry using `+=` is not safe in YAML,
since it's valid to make a YAML object entirely in JSON,
see https://github.com/mermaid-js/mermaid/pull/4640#discussion_r1265133463

We're already using `js-yaml` elsewhere in this file, so we may as well
use it for parsing/stringifying.

Reported-by: Remco Haszing <remcohaszing@gmail.com>
 2023-07-19 23:40:46 +01:00
Alois Klink af9b3f77cb build(docs): allow using custom `editLink` 
In Vitepress, allow using a custom `editLink`, if specified in the YAML
frontmatter.
 2023-07-15 23:43:24 +01:00
Alois Klink 57ee181fad build(docs): add `editLink: ` to MD frontmatter 
Add a YAML front-matter entry called `editLink` to Markdown files in
Vitepress, e.g.

```markdown
---
editLink: "https://github.com/mermaid-js/mermaid/edit/develop/packages/mermaid/src/schemas/config.schema.yaml"
---

Here is my markdown file!
```

Although Vitepress doesn't officially support adding a URL as a
`editLink:` YAML front-matter, we can add a custom `editLink` function
to our Vitepress config that does allow it.
 2023-07-15 23:43:24 +01:00
Alois Klink 7cb009cd38 build(docs): run remark plugins on MermaidConfig 
We use the `unified.stringify()` function on our remark plugins to
stringify the Markdown AST for our MermaidConfig documentation.
However, [`.stringify()`][1] only runs the stringify phase in unified,
not the "run" phase. If we want to run our plugins on the Markdown AST,
we need to also use the [`.run()`][2] function.

[1]: https://github.com/unifiedjs/unified#processorstringifytree-file
[2]: https://github.com/unifiedjs/unified#processorruntree-file-done
 2023-07-13 23:59:27 +01:00
Sidharth Vinod 946b5f161e
Merge pull request #4623 from mermaid-js/renovate/patch-all-patch 
chore(deps): update all patch dependencies (patch)
 2023-07-13 19:09:27 +00:00
renovate[bot] d46ef4cc91
chore(deps): update all patch dependencies 2023-07-11 17:19:31 +00:00
Nikolay Rozhkov 0a493c79ff
Merge pull request #4631 from nirname/refactoring/removed-unused-code-in-state-diagrams 
Removed unused code in state diagrams
 2023-07-11 17:13:03 +00:00
Nikolay Rozhkov 3664ff4463 Removed unused code in state diagrams 2023-07-11 18:12:27 +03:00
Nikolay Rozhkov cd1765a012
Merge pull request #4597 from ibrahimWassouf/bug/4590_allow_notes_identical_to_keywords 
Bug/4590 allow notes identical to keywords
 2023-07-11 11:52:33 +00:00
Ibrahim Wassouf 7bf1d38bad
Merge branch 'develop' into bug/4590_allow_notes_identical_to_keywords 2023-07-10 19:34:51 -04:00
Sidharth Vinod 8e0cb185e9
Merge pull request #4624 from mermaid-js/renovate/all-minor 
chore(deps): update all minor dependencies (minor)
 2023-07-10 06:58:59 +00:00
renovate[bot] 47f46c8a46
chore(deps): update all minor dependencies 2023-07-10 01:17:36 +00:00
Ibrahim Wassouf e127b146e9 Add more test cases 2023-07-08 17:46:28 -03:00
Ibrahim Wassouf c59fee8de2 Split tests to have one parse statement in each test 2023-07-08 17:20:56 -03:00
Ibrahim Wassouf 00bb2a1f68 Revert back to single quotes for generic grammar 2023-07-08 14:45:06 -03:00
Ibrahim Wassouf 007724a7c7
Merge branch 'develop' into bug/4590_allow_notes_identical_to_keywords 2023-07-08 13:34:28 -04:00
Ibrahim Wassouf f82407a2f0 Make unit test regex unit test more accurate 2023-07-08 14:33:57 -03:00
Ibrahim Wassouf 4bec3188de Reformat code 2023-07-08 14:12:45 -03:00
Ibrahim Wassouf fbb6eb849e Give call higher precedence than STR 2023-07-08 14:07:46 -03:00
Ibrahim Wassouf 6a40f4b955 Decouple HREF token from STR and correct grammar 2023-07-08 13:34:51 -03:00
Ibrahim Wassouf 58b2b0993a Give STR token higher precedence 2023-07-08 13:29:48 -03:00
Ibrahim Wassouf d05d249080 Undo state changes 2023-07-08 13:28:45 -03:00
Ibrahim Wassouf 1e781c0c90 Refactor unit tests 2023-07-08 13:23:46 -03:00
Ibrahim Wassouf 23f27d151a Remove redundancy in unit tests 2023-07-07 22:44:34 -03:00
Sidharth Vinod 60c2d494a1
Merge pull request #4607 from mermaid-js/fix/prLabeler 
Run PR-labeler-config-validator only if config changes
 2023-07-07 05:15:14 +00:00
Sidharth Vinod 0f4af09398
Add `Area: Documentation` to labeler 2023-07-07 10:32:13 +05:30
Sidharth Vinod 052e9db16a
Remove filter action 2023-07-07 10:30:59 +05:30
Sidharth Vinod 4648532814
Update .github/workflows/pr-labeler-config-validator.yml 
Co-authored-by: Alois Klink <alois@aloisklink.com>
 2023-07-07 10:29:58 +05:30
Sidharth Vinod 9263f75e5b
Update .github/pr-labeler.yml 
Co-authored-by: Alois Klink <alois@aloisklink.com>
 2023-07-07 10:27:56 +05:30
Sidharth Vinod 8348a2f2d8
Merge pull request #4610 from aloisklink/test/remove-old-default-config-test 
Remove the test checking whether the JSON Schema default config matched the old default config
 2023-07-07 04:41:00 +00:00
Alois Klink 8167f8c1df Revert "test(config): add temp test for defaultConfig" 
This reverts commit 063cb124cd.

This file was originally added to test whether the new implementation
of the default config in
`packages/mermaid/src/schemas/config.schema.yaml` matched the old
existing default config in `packages/mermaid/src/oldDefaultConfig.ts`,
and this test is no longer needed.
 2023-07-07 02:05:43 +01:00
Alois Klink 2b53e02153 test: fix 'new default config' test 
This test was accidentally removed by a bad merge commit, see
29291c89 (Merge branch 'develop' into pr/aloisklink/4112, 2023-07-06).

This test checks whether the default config defined in the
`config.schema.yaml` file matches the old default config defined in
`oldDefaultConfig.ts`.

Fixes: 29291c8901
 2023-07-07 02:01:03 +01:00
Sidharth Vinod 1682fa1e53
Update PR Labeler config 2023-07-06 22:05:58 +05:30
Sidharth Vinod 355586f297
Run PR-labeler-config-validator only if config changes 2023-07-06 22:03:48 +05:30
Sidharth Vinod 194ef202ac
Merge pull request #4603 from mermaid-js/sidv/optimiseDocs 
Avoid downloading avtars everytime on docs:dev
 2023-07-06 16:10:53 +00:00
Sidharth Vinod bcffff3b7b
Terminate build in CI if download fails 2023-07-06 21:36:10 +05:30
Sidharth Vinod d4281d365d
Add Yokozuna59 & nirname 2023-07-06 21:29:40 +05:30
Sidharth Vinod 48050333a0
Merge branch 'develop' into sidv/optimiseDocs 2023-07-06 15:57:01 +05:30
Sidharth Vinod c17dc15c57
chore: Rename to teamMembers 2023-07-06 15:54:27 +05:30
Sidharth Vinod 34abbcadae
Merge pull request #4604 from mermaid-js/sidv/fixCodecov 
chore: Reduce codecov pushes
 2023-07-06 10:20:26 +00:00
Sidharth Vinod 2b5da79cdf
Merge pull request #4112 from aloisklink/add-jsonschema-schema-for-config 
Use JSON Schema to define and document `MermaidConfig`
 2023-07-06 10:03:55 +00:00
Sidharth Vinod 2366ca85b3
Merge branch 'develop' into sidv/fixCodecov 2023-07-06 11:59:44 +05:30
Sidharth Vinod aaec16ed6c
chore: Remove lint warnings in example-diagram 2023-07-06 11:58:55 +05:30
Sidharth Vinod 4d0c461fa3
chore: Reduce codecov pushes 
pushes to non-develop branches will not send coverage reports.
This might reduce the coverage variability issue we're having.
 2023-07-06 11:32:37 +05:30
Sidharth Vinod db30f21ac5
Turn off codecov project status check 2023-07-06 11:16:41 +05:30
Sidharth Vinod d2e62022f1
Avoid downloading avtars everytime on docs:dev 2023-07-06 11:09:09 +05:30
Sidharth Vinod 29291c8901
Merge branch 'develop' into pr/aloisklink/4112 
* develop:
  test: test partial QuadrantChartConfig options
  test: fix types in `config.spec.ts`
  style: fix lint issues in src/config.spec.ts
  test: rename src/config.spec.js to config.spec.ts
  fix lint
  update homepage community link
  docs(flowchart): add documentation on multiple nodes style
  Add docker-specific command, leave commonly used command intact
  Support docs:dev in docker
  Fix lint.
  Update docs
  add ChatGPT plugin blog post
  Fix flowchart tooltip typing
 2023-07-06 10:42:13 +05:30
Sidharth Vinod 1a4e5d9c5a
Merge pull request #4562 from lishid/patch-3 
Fix flowchart tooltip typing bug
 2023-07-06 04:19:08 +00:00
Sidharth Vinod e80e281a66
Merge pull request #4600 from tomperr/docs/4558-multiple-vertices-with-style 
docs(flowchart): add documentation on multiple nodes style
 2023-07-06 04:10:43 +00:00
Nikolay Rozhkov 04597d29c0
Merge pull request #4599 from nirname/fix/support-docs-dev-in-docker 
Support docs:dev in docker
 2023-07-06 04:04:18 +00:00