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

6917 Commits

Author SHA1 Message Date
pbrolin47 7b67f5783e
Merge pull request #4018 from mermaid-js/4016-differentiate-colors 
Mindmaps: differentiate the colors between the root node and the first section #4017
 2023-01-20 09:16:02 +01:00
Per Brolin e8db9b2bd5 Merge branch 'master' of github.com:mermaid-js/mermaid 2023-01-20 09:01:48 +01:00
Knut Sveidqvist 023f2354cd 2023-01-20 08:31:01 +01:00
cnjeftia 5925d8b731 docs: minor fix on markdown in root folder 2023-01-20 11:45:11 +08:00
cnjeftia 96d5bc7695 docs: minor fix on markdown 2023-01-20 11:29:16 +08:00
ashishj 7ef71cc04d Remove old test cases 2023-01-19 21:05:38 +01:00
Knut Sveidqvist 3cd15cdcf2 #4012 Handling rows with only spaces in them 2023-01-19 20:50:36 +01:00
ashishj e865368649 Updating version and clean up package.json 2023-01-19 20:42:33 +01:00
ashishj be818ad57f Pushing fix for broken themeVariable functionality 2023-01-19 20:30:11 +01:00
ashishj ca22e85e55 Merge branch 'release/9.4.0' into timeline 2023-01-19 19:20:29 +01:00
ashishj 652a42fe1a Add directive parsing functionality to timeline diagram 2023-01-19 19:03:05 +01: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
Knut Sveidqvist e573be4afd Merge branch 'develop' into release/9.4.0 2023-01-17 18:08:04 +01:00
Sidharth Vinod 549483d19b
Update funding :) 2023-01-17 22:09:22 +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
Sidharth Vinod 96dedc7b5e
flowchart-elk repro 2023-01-17 21:37:32 +05:30
Jon Ruskin 9629c8d8d6 use undefined not null 2023-01-17 08:31:36 -07:00
Knut Sveidqvist 7e8c1b0393
Merge pull request #3984 from mermaid-js/sidv/internalFCV3 
feat: Flowchart-elk integration
 2023-01-17 14:18:29 +01:00
Knut Sveidqvist e4bdfee85a
Merge pull request #3995 from mermaid-js/sidv/properlyWaitTests 
feat: Wait for rendering to finish before taking image snapshots
 2023-01-17 14:15:28 +01: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
sidharthv96 01a535b8e0 Update docs 2023-01-16 09:52:48 +00:00
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
Sidharth Vinod fba3f8481e
Merge branch 'develop' into sidv/internalFCV3 
* develop:
  chore(deps): update all non-major dependencies
  fix(deps): update dependency dagre-d3-es to v7.0.6
 2023-01-16 13:27:09 +05:30
Sidharth Vinod f0e3bcc37b
Merge pull request #3997 from mermaid-js/renovate/all-minor-patch 
chore(deps): update all non-major dependencies (minor)
 2023-01-16 13:18:56 +05:30
Sidharth Vinod ae7c9475ef
Merge branch 'sidv/properlyWaitTests' into sidv/internalFCV3 
* sidv/properlyWaitTests:
  fix tests
 2023-01-16 13:18:31 +05:30
Sidharth Vinod d320e788c7
fix tests 2023-01-16 13:18:16 +05:30
renovate[bot] 376d1a583c
chore(deps): update all non-major dependencies 2023-01-16 05:22:19 +00:00
renovate[bot] ea3d7bc594 fix(deps): update dependency dagre-d3-es to v7.0.6 2023-01-16 05:18:31 +00:00
Sidharth Vinod ded83b2ce7
Fix title 2023-01-16 02:17:25 +05:30
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
Sidharth Vinod 4d3f151cf0
feat: Wait for rendering to finish before taking image snapshots 2023-01-16 02:07:37 +05:30
Sidharth Vinod 8f8ae64ced
upload error snapshots 2023-01-16 01:23:42 +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
sidharthv96 874f4c0641 Update docs 2023-01-13 14:17:17 +00:00
Sidharth Vinod 60175cd84f
Merge pull request #3986 from LiHowe/patch-1 
Docs: Too many `primaryBorderColor` field
 2023-01-13 19:43:45 +05:30
renovate[bot] ac6d325a00 chore(deps): update all non-major dependencies 2023-01-13 10:02:07 +00: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
Sidharth Vinod 075f55418b
Merge pull request #3985 from aloisklink/test/fix-docs-semantic-merge-conflict 
Fix failing tests due to semantic merge conflict
 2023-01-13 10:20:33 +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
Alois Klink 6c862565aa chore(dev-deps): update vitest to `^0.27.1` 
Updates vitest to `^0.27.1`.

We want to add `importOriginal` feature added in Vitest [v0.26.3][1],
see commit
853eeddba8

[1]: https://github.com/vitest-dev/vitest/releases/tag/v0.26.3
 2023-01-12 23:52:16 +00:00
Sidharth Vinod ee056e1ac3
test: Update width 2023-01-12 19:47:39 +05:30
Sidharth Vinod 0476bdc68f
format 2023-01-12 19:04:06 +05:30
Sidharth Vinod 242a508d50
feat: Flowchart-elk integration 2023-01-12 18:26:08 +05:30
sidharthv96 9ca2e0c5fc Update docs 2023-01-12 07:21:20 +00:00