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,241 Commits 185 Branches 159 Tags
Commit Graph

9241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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