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

1581 Commits

Author SHA1 Message Date
Sidharth Vinod 23fea41fb4
Merge branch 'master' into develop 
* master:
  fix: #4676 redirect fix
  fix style in contributors section of intro
  add latest blog post
 2023-08-03 22:16:17 +05:30
Steph b26449f338 Merge branch 'master' into latest-news 2023-08-02 11:18:28 -07:00
Sidharth Vinod 7ebfc272e4
fix: #4676 redirect fix 2023-08-02 09:36:40 +05:30
Sidharth Vinod c9c2f6c121
Merge pull request #4677 from djadmin/chore_dompurify_unpin_dependency 
chore(deps): unpin the dompurify dependency
 2023-08-02 03:06:18 +00:00
Sidharth Vinod 585834c561
Merge pull request #4689 from Incognito/chore/4678_misleading-ts-ignore-comment 
chore: ts-ignore comment was misleading, JISON doesn't support types
 2023-08-02 03:05:51 +00:00
Brian Graham 4cdb43f791 ts-ignore comment was misleading, JISON doesn't support types 2023-08-01 14:30:58 +02:00
Sidharth Vinod 660162686b
Merge pull request #4681 from mermaid-js/renovate/patch-all-patch 
chore(deps): update all patch dependencies (patch)
 2023-08-01 12:16:41 +00:00
Sidharth Vinod 6e2bf00a43
Merge pull request #4688 from Incognito/docs/4659_new-diagrams-no-directives 
Docs: Directives not needed in new diagrams as yaml formatter does this for all new diagrams
 2023-08-01 12:16:20 +00:00
Brian Graham cc01ff9129 Directives not needed in new diagrams as yaml formatter does this for all new diagrams 2023-08-01 14:08:41 +02:00
renovate[bot] c292c897a1
chore(deps): update all patch dependencies 2023-08-01 08:42:21 +00:00
Alois Klink cc7fd337ac
Merge pull request #4687 from mermaid-js/dependabot/npm_and_yarn/vite-4.3.9 
build(deps-dev): bump vite from 4.3.3 to 4.3.9
 2023-08-01 08:28:15 +00:00
dependabot[bot] 266a5e8133
build(deps-dev): bump vite from 4.3.3 to 4.3.9 
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.3.3 to 4.3.9.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.3.9/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-01 06:38:37 +00:00
dependabot[bot] 55963107d0
build(deps): bump @braintree/sanitize-url from 6.0.0 to 6.0.1 
Bumps [@braintree/sanitize-url](https://github.com/braintree/sanitize-url) from 6.0.0 to 6.0.1.
- [Changelog](https://github.com/braintree/sanitize-url/blob/main/CHANGELOG.md)
- [Commits](https://github.com/braintree/sanitize-url/compare/v6.0.0...v6.0.1)

---
updated-dependencies:
- dependency-name: "@braintree/sanitize-url"
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-01 06:38:16 +00:00
renovate[bot] 1a99825ab2
chore(deps): update all minor dependencies 2023-07-31 01:25:54 +00:00
Dheeraj Joshi 6c12bbb80f chore(deps): unpin the dompurify dependency 2023-07-28 16:02:17 +05:30
Sidharth Vinod 1397a873c2
Merge pull request #4670 from keer4n/docs/fix-style-in-contributors-section-of-intro 
fix style in contributors section of intro
 2023-07-27 17:27:36 +05:30
Knut Sveidqvist 9c92f779ae Updates after testing and new version for mermaid-zenuml 2023-07-26 09:44:24 +02:00
Kiran 304d8844f0 fix style in contributors section of intro 2023-07-26 00:19:50 -06:00
Sidharth Vinod aa54127784
Set proper release version 2023-07-26 11:34:10 +05:30
Sidharth Vinod 21b90cbcd2
Add release version 2023-07-26 11:33:20 +05:30
Sidharth Vinod e1ca108b00
Update version 2023-07-26 11:26:07 +05:30
Sidharth Vinod 29d078c822
Merge branch 'master' into release/10.3.0 
* master:
  chore: Rename C4C to C4
  update latest news section
  Corrects name of C4 link
  Bump zenuml package version
 2023-07-26 11:23:24 +05:30
Sidharth Vinod dbee34aba7
fix: edgeLabel width 2023-07-26 11:14:46 +05:30
Steph edf94790f2 add latest blog post 2023-07-25 10:22:17 -07:00
Sidharth Vinod d178626bac
Merge branch 'develop' into release/10.4.0 
* develop:
  Add MERMAID_RELEASE_VERSION in sankey
 2023-07-25 21:55:24 +05:30
Sidharth Vinod d69a2f7895
Merge branches 'develop' and 'develop' of https://github.com/mermaid-js/mermaid into develop 
* 'develop' of https://github.com/mermaid-js/mermaid: (21 commits)
  Add comments
  Update packages/mermaid/src/rendering-util/types.d.ts
  Remove redundant test. Already checked in lint.
  Update docs
  Fix lint
  Update packages/mermaid/src/rendering-util/splitText.spec.ts
  Add comments
  Add tests without Intl.Segmenter
  Cleanup
  Fix flowchart failure
  Handle proper formatting for markdown strings
  createText to TS
  Use joiner to split unicode
  Add types
  rename handle-markdown-text
  Add logs
  Cleanup
  Use splitLineToFitWidth function
  Update docs
  feat: split unicode properly
  ...

* 'develop' of https://github.com/mermaid-js/mermaid: (21 commits)
  Add comments
  Update packages/mermaid/src/rendering-util/types.d.ts
  Remove redundant test. Already checked in lint.
  Update docs
  Fix lint
  Update packages/mermaid/src/rendering-util/splitText.spec.ts
  Add comments
  Add tests without Intl.Segmenter
  Cleanup
  Fix flowchart failure
  Handle proper formatting for markdown strings
  createText to TS
  Use joiner to split unicode
  Add types
  rename handle-markdown-text
  Add logs
  Cleanup
  Use splitLineToFitWidth function
  Update docs
  feat: split unicode properly
  ...
 2023-07-25 21:54:32 +05:30
Knut Sveidqvist 97f457ca4a Merge branch 'develop' into release/10.4.0 2023-07-25 17:30:24 +02:00
Sidharth Vinod 48c8311369
Add MERMAID_RELEASE_VERSION in sankey 2023-07-25 20:49:54 +05:30
Knut Sveidqvist 15c6dfcbb5 Updates after tests 2023-07-25 16:43:09 +02:00
Sidharth Vinod 651bc980d2
Merge branch 'sidv/splitUnicode' of https://github.com/mermaid-js/mermaid into sidv/splitUnicode 
* 'sidv/splitUnicode' of https://github.com/mermaid-js/mermaid:
  Update packages/mermaid/src/rendering-util/types.d.ts
 2023-07-25 20:10:17 +05:30
Sidharth Vinod 841ae15fb5
Add comments 2023-07-25 20:10:05 +05:30
Sidharth Vinod a7d40724b4
Update packages/mermaid/src/rendering-util/types.d.ts 
Co-authored-by: Alois Klink <alois@aloisklink.com>
 2023-07-25 19:13:54 +05:30
Sidharth Vinod 409dedb3ef
Remove redundant test. 
Already checked in lint.
 2023-07-25 19:08:40 +05:30
Sidharth Vinod 68305fea9e
Fix lint 2023-07-25 18:56:58 +05:30
Sidharth Vinod ea192ccf4d
Merge branch 'develop' into sidv/splitUnicode 2023-07-25 18:55:34 +05:30
Sidharth Vinod 509a580f9d
Merge pull request #4396 from gjtorikian/patch-2 
Fix a typo
 2023-07-25 18:54:56 +05:30
Sidharth Vinod 91ae9a2901
Merge branch 'master' into pr/Incognito/4660 
* master:
  update latest news section
 2023-07-25 18:41:26 +05:30
Sidharth Vinod 27d98728a6
chore: Rename C4C to C4 2023-07-25 17:42:12 +05:30
Steph 28bb0df6c8 update latest news section 2023-07-24 22:15:22 -07:00
kgilbert78 3e3e784fd9 added Typora to integrations list 2023-07-24 13:24:33 -04:00
renovate[bot] e4699ef02a
chore(deps): update all patch dependencies 2023-07-24 00:18:49 +00:00
Brian Graham 60cf043c3d
Corrects name of C4 link 2023-07-23 08:27:54 +02:00
Sibin Thomas 114f918417
Merge branch 'develop' into feature/4451-vertical-branches-in-gitgraph 2023-07-20 21:29:56 +05:30
Sibin Thomas 346a7fe8b2 Merge branch 'feature/4451-vertical-branches-in-gitgraph' of https://github.com/mastersibin/mermaid into feature/4451-vertical-branches-in-gitgraph 2023-07-20 21:28:21 +05:30
Sibin Thomas 8ae35c1382 updated documentation for vertical branches 2023-07-20 21:27:34 +05:30
Sidharth Vinod 4795204719
Merge branch 'develop' into sidv/docsVersion 
* develop:
  build(docs): handle YAML edgecases in markdown
  run pnpm lint:fix
  Update cypress/helpers/util.ts
  change deprecated `btoa` into `Buffer.from`
  allow ts extension imports in cypress ts files
  build(docs): allow using custom `editLink`
  build(docs): add `editLink: ` to MD frontmatter
  build(docs): run remark plugins on MermaidConfig
  Fix import file extension
  Batch by commit
  resolve lint issues for `no-inferrable-types`
  fix wrong config paramater in some cypress spec
  convert cypress/helpers/util.js into ts
  convert file from js into ts
 2023-07-20 20:46:53 +05:30
Sibin Thomas 99e88e4d0d
Merge branch 'develop' into feature/4451-vertical-branches-in-gitgraph 2023-07-20 16:03:19 +05:30
Sidharth Vinod 1b2340ba75
Merge pull request #4640 from aloisklink/docs/fix-edit-url 
Fix the "Edit this page on GitHub" link in Vitepress documentation for the Mermaid Config pages
 2023-07-20 06:59:46 +00:00
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
Sibin Thomas cba5b5a7e3 ran preetier 2023-07-19 21:55:24 +05:30