GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-21 06:53:17 +08:00
Code Issues Projects Releases Wiki Activity
9,172 Commits 185 Branches 159 Tags
Commit Graph

9172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Sidharth Vinod
a9610d3ba0
Merge pull request #5109 from FutzMonitor/issue5108 
Changes to .prettierignore
 2023-12-05 04:05:23 +00:00
futzmonitor
11affc32ee 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.
 2023-12-04 15:47:58 -05:00
Sidharth Vinod
5d56835c31
Merge pull request #5104 from aloisklink/chore/use-tsx-instead-of-ts-node-esm 
build: use `tsx` instead of `ts-node-esm`
 2023-12-04 14:48:43 +00: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
798f9f8b78
chore: Downgrade node to 18.18.2 2023-12-04 12:46:56 +05:30
Sidharth Vinod
87a0ab3438
Merge pull request #5099 from mermaid-js/renovate/all-minor 
chore(deps): update all minor dependencies (minor)
 2023-12-04 06:32:54 +00:00
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
886405b65f
Merge pull request #5098 from mermaid-js/4578-generic-class-in-namespace 
Fix issue with generic class not rendering
 2023-12-04 05:59:48 +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
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
f81e4d4361
Merge pull request #5085 from d-faure/PmWiki-integration 
Referenced the PmWiki's Cookbook recipe enabling MermaidJs schematics…
 2023-11-29 03:57:11 +00:00
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
Sidharth Vinod
1564358421
Merge pull request #4288 from iwestlin/fix/pie-chart-viewbox 
fix: Adjust piechart viewbox for mobile devices with small width
 2023-11-28 12:01:28 +00:00
Alois Klink
72d2d04dcc
Merge pull request #5006 from lchenay/patch-1 
fix case that generate broken link on docs
 2023-11-28 11:55:57 +00:00
Alois Klink
005c998438 test(e2e): fix pie chart E2E tests for PR #4288 2023-11-28 11:37:12 +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
Sidharth Vinod
403ac4b76b
chore: Fix computeWidth function 2023-11-28 10:39:34 +05:30
Sidharth Vinod
0620c6daf2
chore: Cleanup setupGraphViewbox 2023-11-28 10:34:58 +05:30
Sidharth Vinod
1f4e335f8d
Merge branch 'develop' into pr/iwestlin/4288 
* develop: (596 commits)
  chore(deps): update all minor dependencies
  chore(deps): update all patch dependencies
  fix: flowchart image without text
  fix Types
  chore: Update pnpm-lock
  chore: Add tests for calculateDeltaAndAngle
  fix: #5064 Handle case when line has only one point
  reset the testTimeout to 5 seconds and change it directly in the test
  update testTimeout from 5 seconds to 10 seconds
  Update all patch dependencies
  fix broken link
  add latest blog post
  Update all minor dependencies
  Update all patch dependencies
  Fix docs
  Update packages/mermaid/src/docs/community/questions-and-suggestions.md
  Update packages/mermaid/src/diagrams/class/classRenderer-v2.ts
  update edge ids
  draw top actors with lines  first followed by messages
  Bump GitHub workflow actions to latest versions
  ...
 2023-11-28 10:34:18 +05:30
ad1992
18bc2af570 Update docs 2023-11-28 03:38:09 +00:00
Aakansha Doshi
fe4485c55f update mermaidAPI to cleanup the text before passing to getDiagramFromText 2023-11-28 09:05:00 +05:30
Matheus Braga
5718be50ee
Merge branch 'develop' into feature/4935_subgraph-title-margin-config-option 2023-11-27 22:17:32 -03:00
Matheus B
8e794e3af9 Merge branch 'feature/4935_subgraph-title-margin-config-option' of https://github.com/mathbraga/mermaid into feature/4935_subgraph-title-margin-config-option 2023-11-27 22:13:00 -03:00
Matheus B
7979b2830f Add test for subgraphs with title margins and edge labels 2023-11-27 22:12:41 -03:00
Matheus B
a807a58a29 Modify margin logic to avoid creating unnecessary space in subgraph 2023-11-27 22:10:05 -03:00
Aakansha Doshi
d3d4948b3a
Merge branch 'develop' into aakansha/bug/5075-fix-getDiagramFromText-api 2023-11-27 19:51:33 +09:00
Aakansha Doshi
4dbfa2f0d3 review fixes 2023-11-27 16:11:25 +05:30
Alois Klink
25e9bb354e
Merge pull request #4837 from mermaid-js/refactor/unifyEdgeMarkers 
refactor: Unify the edgeMarker adding logic
 2023-11-27 10:07:42 +00:00
Sidharth Vinod
7ca76b02e1
Merge pull request #5063 from bonyuta0204/bug/4736_zero_size_image_flowchart 
fix: flowchart image without text
 2023-11-27 08:28:48 +00:00
Aakansha Doshi
282da45d0e
Merge branch 'develop' into aakansha/bug/5075-fix-getDiagramFromText-api 2023-11-27 17:04:39 +09:00
Aakansha Doshi
7e119381e8 add test 2023-11-27 13:33:01 +05:30
Aakansha Doshi
4a4d715270 remove unused variable 2023-11-27 13:25:13 +05:30
Aakansha Doshi
1d5378a4f2 fix: clean comments in text in getDiagramFromText API so flowchart works well 2023-11-27 13:19:31 +05:30
Sidharth Vinod
62b991b6f7
Merge pull request #5071 from mermaid-js/renovate/all-minor 
chore(deps): update all minor dependencies (minor)
 2023-11-27 06:38:25 +00:00