2255 Commits

Author SHA1 Message Date
Sidharth Vinod
977a3f2246
Merge branch 'develop' into release/10.6.2
* develop: (22 commits)
  chore(deps): update all minor dependencies
  adds corresponding change in docs/ecosystem
  Adds Unison programming language to community integrations list
  Fixed parser/tests
  Update docs
  Update classDiagram.md
  Update classDiagram.md
  Update docs
  Update packages/mermaid/src/diagrams/class/classDb.ts
  Update packages/mermaid/src/docs/syntax/classDiagram.md
  Update packages/mermaid/src/diagrams/class/classDb.ts
  chore(deps): update all minor dependencies
  Update generics docs
  Update docs
  Address potential undefined
  refactor: Move maxEdges out of flowchart config.
  refactor: Move maxEdges out of flowchart config.
  chore: Add maxEdges to secure list
  Update packages/mermaid/src/diagrams/class/classDb.ts
  Update docs
  ...
2024-01-11 10:19:00 +05:30
Sidharth Vinod
34e0942fa2
Merge pull request #5172 from mermaid-js/renovate/all-minor
chore(deps): update all minor dependencies (minor)
2024-01-10 17:10:14 +00:00
renovate[bot]
8383b1b9bc
chore(deps): update all minor dependencies 2024-01-10 15:44:22 +00:00
Rebecca Mark
54db85bfea Adds Unison programming language to community integrations list 2024-01-04 13:27:02 -08:00
Justin Greywolf
2b4940d67d Merge branch '2408-support-style-for-class' of https://github.com/mermaid-js/mermaid into 2408-support-style-for-class 2023-12-18 06:27:30 -08:00
Justin Greywolf
c5220bd92d Fixed parser/tests 2023-12-18 06:27:10 -08:00
Justin Greywolf
1babceb63c
Update classDiagram.md 2023-12-14 06:48:13 -08:00
Justin Greywolf
237518ba3b
Update classDiagram.md 2023-12-14 06:47:37 -08:00
Justin Greywolf
a71bdbd2bb
Merge branch 'develop' into 2408-support-style-for-class 2023-12-11 04:56:11 -08:00
Justin Greywolf
668bf327d5
Update packages/mermaid/src/diagrams/class/classDb.ts
Co-authored-by: Alois Klink <alois@mermaidchart.com>
2023-12-11 04:45:48 -08:00
Justin Greywolf
3dce04e0a9
Update packages/mermaid/src/docs/syntax/classDiagram.md
Co-authored-by: Alois Klink <alois@mermaidchart.com>
2023-12-11 04:45:16 -08:00
Justin Greywolf
24957f44df
Update packages/mermaid/src/diagrams/class/classDb.ts
Co-authored-by: Alois Klink <alois@mermaidchart.com>
2023-12-11 04:44:53 -08:00
Justin Greywolf
5a26edf6c0 Update generics docs 2023-12-10 17:01:36 -08:00
Justin Greywolf
b51ca4fb15 Address potential undefined 2023-12-10 13:25:16 -08:00
Justin Greywolf
3bb005b973 Merge branch 'develop' into 2408-support-style-for-class 2023-12-10 13:18:58 -08:00
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
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
Arda Aydın
1d08155fb1
Update NiceGuy.io links in integrations-community.md 2023-12-07 02:30:21 +03: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
Justin Greywolf
ca386ab597 Update docs 2023-12-05 07:10:45 -08:00
Nikolay Rozhkov
fe07e9da46
Merge pull request #5102 from mermaid-js/5100_SankeyViewbox
fix: #5100 Add viewbox to sankey
2023-12-05 10:14:55 +00:00
Justin Greywolf
1ecae7dc93 Merge branch 'develop' into 2408-support-style-for-class 2023-12-04 13:29:00 -08:00
Justin Greywolf
239fad94ee Grammar/rendering for setting style on class node 2023-12-04 13:28:31 -08:00
Alois Klink
4a7e4a3bcb build: use tsx instead of ts-node-esm
`ts-node-esm` v10.9.1 is not compatible with Node.JS v18.19.0.
2023-12-04 11:25:58 +00:00
Alois Klink
6a31ae6b4f
Merge pull request #4944 from RounakJoshi09/bug/#4497_unable-to-cherrypick-merge-commit
Bug/#4497 Unable to Cherry Pick Merge Commit Solved
2023-12-04 09:15:03 +00:00
Sidharth Vinod
80fa3e9597
update docs 2023-12-04 12:28:05 +05:30
Sidharth Vinod
60ea9a2972
v10.6.2-rc.2 2023-12-04 12:20:40 +05:30
Sidharth Vinod
1165fb163d
Merge branch 'develop' into release/10.6.2
* develop: (47 commits)
  chore(deps): update all minor dependencies
  chore: Rename test
  test: Add unit test for generic classname and namespace
  Split type from generic class name
  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
  Add test for subgraphs with title margins and edge labels
  Modify margin logic to avoid creating unnecessary space in subgraph
  review fixes
  add test
  remove unused variable
  fix: clean comments in text in getDiagramFromText API so flowchart works well
  chore(deps): update all minor dependencies
  ...
2023-12-04 12:20:17 +05:30
Sidharth Vinod
160c7d399a
fix: #5100 Add viewbox to sankey 2023-12-04 11:36:07 +05:30
renovate[bot]
e87243c135
chore(deps): update all minor dependencies 2023-12-04 06:04:52 +00:00
Sidharth Vinod
761fa27eea
chore: Rename test 2023-12-04 11:22:09 +05:30
Sidharth Vinod
93a920cdfe
test: Add unit test for generic classname and namespace 2023-12-04 11:21:27 +05:30
Sidharth Vinod
d22ee8d1d5
fix: Check if parentCommit is provided 2023-12-04 11:13:52 +05:30
Sidharth Vinod
f806de3a1d
Merge branch 'develop' into sidv/5042_maxEdges 2023-12-04 09:57:26 +05:30
Justin Greywolf
8de1bde8f4 Split type from generic class name 2023-12-03 18:01:00 -08:00
RounakJoshi09
31a1de1566
Condition of Parent Id Without Merge Commit Added 2023-12-04 00:28:01 +05:30
RounakJoshi09
c6bf9083c8
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit 2023-12-04 00:19:28 +05:30
Sidharth Vinod
fdf9988af1
feat #5042: Add flowchart.maxEdges config. 2023-11-28 19:07:10 +05:30
d-faure
ae7003aa39 Merge remote-tracking branch 'origin/develop' into PmWiki-integration 2023-11-28 14:01:30 +01:00
d-faure
f35fb3955d Referenced the PmWiki's Cookbook recipe enabling MermaidJs schematics in wiki pages 2023-11-28 13:50:31 +01:00
Sidharth Vinod
4499926453
Merge pull request #5076 from ad1992/aakansha/bug/5075-fix-getDiagramFromText-api
fix: clean comments in text in getDiagramFromText API so flowchart works well
2023-11-28 12:02:57 +00:00
Sidharth Vinod
252a8a73b1
Merge pull request #5041 from mathbraga/feature/4935_subgraph-title-margin-config-option
Feature/4935 subgraph title margin config option
2023-11-28 12:02:03 +00:00
Aakansha Doshi
4ed7b2be02
Add dummy commit to trigger GH checks 2023-11-28 12:05:52 +05:30
Sidharth Vinod
89b392327a
chore: Revert unnecessary export 2023-11-28 11:34:58 +05:30
Sidharth Vinod
9c2dae92f8
refactor: Remove unnecessary calculations 2023-11-28 11:30:41 +05:30