Commit Graph

10439 Commits

Author SHA1 Message Date
Justin Greywolf
3bb005b973 Merge branch 'develop' into 2408-support-style-for-class 2023-12-10 13:18:58 -08:00
Sidharth Vinod
d91934b219 comment out skipped test 2023-12-10 22:38:50 +05:30
Sidharth Vinod
9f061c5eba Merge pull request #5086 from mermaid-js/sidv/5042_maxEdges
feat #5042: Add `flowchart.maxEdges` config.
2023-12-10 16:39:57 +00:00
Sidharth Vinod
ff6188bd80 Merge pull request #5118 from mermaid-js/sidv/diagramType
feat: Add diagramType to RenderResult and ParseResult
2023-12-10 22:05:40 +05:30
Sidharth Vinod
dc1b2a6873 Merge pull request #5126 from diegosogari/chore/5125-fix-duplicate-config-types
Remove default properties before generating the config types
2023-12-10 22:05:12 +05:30
Matheus B
c8f0b39075 Add e2e test for edge case 2023-12-08 13:39:53 -03:00
Matheus Braga
7e1cc27c76 Merge branch 'mermaid-js:develop' into bug/5059_fix_external_connection_after_updating_edges 2023-12-08 13:15:09 -03:00
Matheus B
8bff32adab Modify algorithm to re-check for external connections after defining anchor nodes 2023-12-08 13:08:13 -03:00
Diego Sogari
d732a146c2 Merge branch 'next' into chore/5125-fix-duplicate-config-types 2023-12-08 09:35:43 -03:00
Sidharth Vinod
b9bc518a0a chore: Add docs 2023-12-08 10:06:36 +05:30
Sidharth Vinod
edf32911be Merge branch 'sidv/diagramType' of https://github.com/mermaid-js/mermaid into sidv/diagramType
* 'sidv/diagramType' of https://github.com/mermaid-js/mermaid:
  Update docs
  Update packages/mermaid/src/docs/config/usage.md
2023-12-08 09:57:33 +05:30
Sidharth Vinod
b8470a471b chore: Add docs 2023-12-08 09:57:08 +05:30
sidharthv96
45880395ea Update docs 2023-12-08 04:18:24 +00:00
Sidharth Vinod
6f3c9205cd Update packages/mermaid/src/docs/config/usage.md
Co-authored-by: Alois Klink <alois@mermaidchart.com>
2023-12-08 09:45:49 +05:30
Sidharth Vinod
96c90b24d1 Merge branch 'next' into sidv/diagramType
* next:
  chore: Fix import.meta.vitest warnings
  Update docs
  Update NiceGuy.io links in integrations-community.md
2023-12-08 09:39:14 +05:30
Sidharth Vinod
aa4bfa0727 chore: Fix import.meta.vitest warnings 2023-12-08 09:38:54 +05:30
Sidharth Vinod
8873ffca12 chore: Overload parse type to be more specific.
Co-authored-by: Alois Klink <alois@aloisklink.com>
2023-12-08 09:37:46 +05:30
Diego Sogari
0bda748ad9 Remove default properties before generating the config types 2023-12-07 17:30:56 -03:00
Steph
f363af482e verbiage updates 2023-12-07 10:14:33 -08:00
Faris Nabiev
b60fc1b056 fix: replace functional approaches with oop 2023-12-07 11:32:49 +03:00
Sidharth Vinod
867686fe34 refactor: Address review comments 2023-12-07 11:27:48 +05:30
Sidharth Vinod
7c3bd9abd2 Merge branch 'develop' into release/10.6.2
* develop:
  Update docs
  Update NiceGuy.io links in integrations-community.md
  build(deps-dev): bump vite from 4.4.9 to 4.4.12
  Changes to .prettierignore 1. Added 'demos/dev/**' to be ignored by Prettier. 2. Added '!/demos/dev/example.html' so that Prettier ensures no one changes the example.html in a way that doesn't obey the Prettier code formatting rules.
  build: use `tsx` instead of `ts-node-esm`
  fix: #5100 Add viewbox to sankey
  fix: Check if parentCommit is provided
  Condition of Parent Id Without Merge Commit Added
  Error Hash Removed
  Linting Issue Fixed
  Updated gitgraph.md
  Linting Issue Fixed
  Documentation Modified New Ex Added
  e2e test case added
  Merge Conflict Resolved
  Suggested Changes FOR PR DONE
  documentation added, Tests Fixed
  All Unit Tests Passing
  Unit Test Cases Added
  Parser and Logic For Parent Commit Added
2023-12-07 11:02:52 +05:30
Sidharth Vinod
60f92dcdbc Merge branch 'develop' into next
* develop:
  Update docs
  Update NiceGuy.io links in integrations-community.md
2023-12-07 11:02:27 +05:30
Sidharth Vinod
d3257cef80 Merge branch 'develop' into sidv/5042_maxEdges 2023-12-07 11:01:19 +05:30
Sidharth Vinod
69f31097e7 refactor: Move maxEdges out of flowchart config. 2023-12-07 10:55:12 +05:30
Sidharth Vinod
9b34adf2c9 refactor: Move maxEdges out of flowchart config. 2023-12-07 10:49:20 +05:30
Sidharth Vinod
3b7cabee4b chore: Add maxEdges to secure list 2023-12-07 10:39:10 +05:30
Sidharth Vinod
4f9988a799 Merge pull request #5120 from Abrifq/patch-3
Update NiceGuy.io links in integrations-community.md
2023-12-07 10:22:30 +05:30
Sidharth Vinod
22f83f1614 fix: Sequence actor rendering 2023-12-07 09:57:02 +05:30
Abrifq
f476c25c6d Update docs 2023-12-06 23:33:21 +00:00
Arda Aydın
1d08155fb1 Update NiceGuy.io links in integrations-community.md 2023-12-07 02:30:21 +03:00
Sidharth Vinod
a9818b40b6 chore: Remove special case error handling 2023-12-07 01:27:54 +05:30
Sidharth Vinod
85774b7e46 chore: Fix configAPI 2023-12-07 01:04:12 +05:30
Sidharth Vinod
886eda92a9 chore: await drawActors 2023-12-07 00:40:45 +05:30
Sidharth Vinod
1d86cf01ad refactor: Cleanup error renderer 2023-12-07 00:37:25 +05:30
Sidharth Vinod
70b948fd17 refactor: Optimize renderKatex 2023-12-07 00:36:21 +05:30
Sidharth Vinod
0d98e6ca53 refactor: Revert type change for renderer 2023-12-07 00:17:53 +05:30
Sidharth Vinod
8d90815862 Merge branch 'develop' into pr/NicolasNewman/2885
* develop: (192 commits)
  build(deps-dev): bump vite from 4.4.9 to 4.4.12
  Changes to .prettierignore 1. Added 'demos/dev/**' to be ignored by Prettier. 2. Added '!/demos/dev/example.html' so that Prettier ensures no one changes the example.html in a way that doesn't obey the Prettier code formatting rules.
  build: use `tsx` instead of `ts-node-esm`
  chore: Downgrade node to 18.18.2
  fix: #5100 Add viewbox to sankey
  chore(deps): update all minor dependencies
  chore: Rename test
  test: Add unit test for generic classname and namespace
  fix: Check if parentCommit is provided
  Split type from generic class name
  Condition of Parent Id Without Merge Commit Added
  Referenced the PmWiki's Cookbook recipe enabling MermaidJs schematics in wiki pages
  test(e2e): fix pie chart E2E tests for PR #4288
  Add dummy commit to trigger GH checks
  chore: Revert unnecessary export
  refactor: Remove unnecessary calculations
  chore: Fix computeWidth function
  chore: Cleanup setupGraphViewbox
  Update docs
  update mermaidAPI to cleanup the text before passing to getDiagramFromText
  ...
2023-12-07 00:01:01 +05:30
Sidharth Vinod
6871ad09e6 test: Update tests 2023-12-06 22:27:00 +05:30
Sidharth Vinod
479188bc40 refactor: Change return type to retain partial backwards compatibility. 2023-12-06 22:23:37 +05:30
Sidharth Vinod
c3c7ccd78a feat: Add diagramType to RenderResult and ParseResult #5117 2023-12-06 21:11:07 +05:30
Sidharth Vinod
000b432bb2 Merge branch 'develop' into next
* develop: (70 commits)
  build(deps-dev): bump vite from 4.4.9 to 4.4.12
  Changes to .prettierignore 1. Added 'demos/dev/**' to be ignored by Prettier. 2. Added '!/demos/dev/example.html' so that Prettier ensures no one changes the example.html in a way that doesn't obey the Prettier code formatting rules.
  build: use `tsx` instead of `ts-node-esm`
  chore: Downgrade node to 18.18.2
  fix: #5100 Add viewbox to sankey
  chore(deps): update all minor dependencies
  chore: Rename test
  test: Add unit test for generic classname and namespace
  fix: Check if parentCommit is provided
  Split type from generic class name
  Condition of Parent Id Without Merge Commit Added
  Referenced the PmWiki's Cookbook recipe enabling MermaidJs schematics in wiki pages
  test(e2e): fix pie chart E2E tests for PR #4288
  Add dummy commit to trigger GH checks
  chore: Revert unnecessary export
  refactor: Remove unnecessary calculations
  chore: Fix computeWidth function
  chore: Cleanup setupGraphViewbox
  Update docs
  update mermaidAPI to cleanup the text before passing to getDiagramFromText
  ...
2023-12-06 20:50:04 +05:30
Alois Klink
dacd2cbc30 Merge remote-tracking branch 'origin/develop' into bug/4358_suppress_error_rendering
I ran `pnpm run --filter mermaid docs:build` to fix merge conflicts in
docs/config/setup/modules/mermaidAPI.md
2023-12-06 09:12:00 +00:00
Alois Klink
c7b38b824b Merge pull request #5116 from mermaid-js/sidv/bannerClick
feat: Track outbound links in docs site.
2023-12-06 08:29:30 +00:00
Sidharth Vinod
770fc412ca feat: Track outbound links in plausible
Unlike mermaid.live, there is no user provided links in mermaid.js.org.
So we can track the outbound link clicks without leaking any user data.
2023-12-06 11:47:15 +05:30
Sidharth Vinod
cc4af0cafa Merge pull request #5115 from mermaid-js/dependabot/npm_and_yarn/vite-4.4.12
build(deps-dev): bump vite from 4.4.9 to 4.4.12
2023-12-06 06:08:46 +00:00
futzmonitor
03b5c00f03 Merge branch 'develop' into issue1981 2023-12-05 21:56:08 -05:00
dependabot[bot]
faf282b45b build(deps-dev): bump vite from 4.4.9 to 4.4.12
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.4.9 to 4.4.12.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v4.4.12/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.4.12/packages/vite)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-05 23:52:12 +00:00
Justin Greywolf
02b2d71eb3 Update packages/mermaid/src/diagrams/class/classDb.ts
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-12-05 07:57:39 -08:00
Justin Greywolf
e25515a960 Merge branch 'develop' into 2408-support-style-for-class 2023-12-05 07:11:08 -08:00