Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/10.7.0 #5188

Merged
merged 329 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
329 commits
Select commit Hold shift + click to select a range
6dc8e58
GitGraph: Refactor hasOverlappingCommits function
guypursey Oct 7, 2023
33050e1
GitGraph: Update variable names in drawArrow fn
guypursey Oct 7, 2023
4787bb0
GitGraph: corrected object method in hasOverlappingCommits
guypursey Oct 11, 2023
60bb7b5
GitGraph: updated demo page to include top-to-bottom examples.
guypursey Oct 12, 2023
9469f75
GitGraph: Moved overlapping commit arrow colour inside conditional
guypursey Oct 12, 2023
69ec4a0
GitGraph: Added cherry-pick and merge demos for to GitGraph.
guypursey Oct 12, 2023
8c43d22
GitGraph: added destination branch check into overlapping fn.
guypursey Oct 12, 2023
9f8457d
GitGraph: Rewrote overlap fn to make main branch exception to rule.
guypursey Oct 12, 2023
461a293
GitGraph: refactored overlapping fn for efficiency/performance
guypursey Oct 13, 2023
902a9dd
GitGraph: added and updated demos to align with some of e2e testing
guypursey Oct 13, 2023
dba7197
GitGraph: simplified overlapping check fn
guypursey Oct 13, 2023
7c87df7
GitGraph: rename overlap check to shouldRerouteArrow
guypursey Oct 13, 2023
3ba33c8
GitGraph: added more to demos
guypursey Oct 15, 2023
3e18e76
GitGraph: removed check of branch with main from arrow reroute fn
guypursey Oct 15, 2023
25a678c
GitGraph: added e2e tests for multiple branches from one commit
guypursey Oct 15, 2023
b0b2768
GitGraph: fixed an e2e branch for vertical branch
guypursey Oct 17, 2023
2acad55
GitGraph: e2e tests, added commit IDs to test graphs
guypursey Oct 17, 2023
adfe172
GitGraph: Added e2e tests for deferred branch use.
guypursey Oct 23, 2023
0555368
GitGraph: added branch checking to rerouting
guypursey Oct 24, 2023
f7d83e2
GitGraph: added 2x e2e tests for branches not used immediately
guypursey Oct 24, 2023
31a8e04
GitGraph: corrected minor typo in comment.
guypursey Oct 26, 2023
bf52e76
GitGraph: Moved branch curve check to within reroute check fn
guypursey Oct 27, 2023
d80e1a2
GitGraph: added commit IDs to e2e test to remove false positives
guypursey Oct 27, 2023
a9c5d90
GitGraph: simplified branch check in arrow rerouting fn
guypursey Oct 27, 2023
57a9d73
GitGraph: made reroute fn more readable
guypursey Oct 27, 2023
379722d
Fix case that generate broken link on docs
lchenay Nov 2, 2023
6e6e92a
review fixes
ad1992 Nov 3, 2023
6a5b7c4
Merge branch 'develop' into bug/4983-fix-getMessageAPI
ad1992 Nov 3, 2023
58bad98
move decodeEntities to utils
ad1992 Nov 3, 2023
a818f3e
add comment for ts ignore
ad1992 Nov 3, 2023
4ba3e2c
Update index.md
StefonSimmons Nov 3, 2023
b5fd8fb
fix text-decoration for abstract attibutes
SteffenLm Nov 3, 2023
dff1343
review fixes
ad1992 Nov 6, 2023
23cbf50
fix: render the participants in same order as they are created
ad1992 Nov 6, 2023
78c1a3d
fix
ad1992 Nov 6, 2023
dff8b78
fix
ad1992 Nov 6, 2023
51d076a
Merge branch 'develop' into bug/4946-fix-svg-order-sequence-participant
ad1992 Nov 6, 2023
396ea3c
Update demos/sequence.html
ad1992 Nov 6, 2023
7a3ce3e
Merge pull request #5018 from mermaid-js/master
aloisklink Nov 6, 2023
eb4bd31
Merge pull request #5002 from ad1992/bug/4983-fix-getMessageAPI
sidharthv96 Nov 7, 2023
6e74e91
chore(deps): update all patch dependencies
renovate[bot] Nov 7, 2023
30646d8
Merge pull request #5015 from mermaid-js/renovate/patch-all-patch
sidharthv96 Nov 7, 2023
c9ace33
Add new Atlassian integrations
dev1bryant Nov 8, 2023
71478f5
Merge pull request #5014 from Abrifq/patch-2
aloisklink Nov 8, 2023
f6b1e04
Merge branch 'develop' into docs/patch-1
nashtechlabs Nov 8, 2023
c2e26ba
Merge pull request #4930 from Mister-Hope/patch-2
sidharthv96 Nov 8, 2023
d1fba9c
Merge pull request #4824 from JackuB/patch-1
sidharthv96 Nov 8, 2023
4952b13
fix: Ignore unknown arrow type values
sidharthv96 Nov 8, 2023
8f57202
chore: Add test for invalid marker
sidharthv96 Nov 8, 2023
e46626d
Merge branch 'develop' into refactor/unifyEdgeMarkers
sidharthv96 Nov 8, 2023
fadae38
Merge branch 'develop' into docs/patch-1
nashtechlabs Nov 8, 2023
09d9c31
chore: Reset mock in edgeMarker test
sidharthv96 Nov 9, 2023
c8a826d
Merge pull request #5012 from StefonSimmons/patch-1
sidharthv96 Nov 9, 2023
3038ce5
Merge pull request #5021 from nashtechlabs/docs/patch-1
sidharthv96 Nov 9, 2023
79bae62
Merge pull request #4973 from SahilNagpure07/patch-1
sidharthv96 Nov 9, 2023
ac595eb
Merge pull request #4947 from SusheelThapa/patch
sidharthv96 Nov 9, 2023
adfb60e
fix typo
sidharthv96 Nov 9, 2023
3cf0a2b
Merge pull request #4893 from 0xflotus/patch-1
sidharthv96 Nov 9, 2023
051260e
Merge branch 'develop' of https://github.com/mermaid-js/mermaid into …
sidharthv96 Nov 9, 2023
72038a6
Fix typo
sidharthv96 Nov 9, 2023
ee49c4b
Merge pull request #4933 from REVERB283/bug/4716_fix_target_blank_get…
sidharthv96 Nov 9, 2023
8d6317b
Merge branch 'develop' into pr/csholmq/4958
sidharthv96 Nov 9, 2023
4a92fc5
Fix lint
sidharthv96 Nov 9, 2023
1571b25
Merge pull request #4958 from csholmq/fix/tooltip
sidharthv96 Nov 9, 2023
f47e920
Documentation: clarify sentence
deining Nov 9, 2023
fe32bcb
Update docs
deining Nov 9, 2023
6fb5641
Bump GitHub workflow actions to latest versions
deining Nov 9, 2023
01bbcc5
draw top actors with lines first followed by messages
ad1992 Nov 9, 2023
a8fe640
update edge ids
jgreywolf Nov 9, 2023
e8ad72a
Merge branch 'develop' into 3952-lexical-ids
jgreywolf Nov 9, 2023
c89557d
Merge pull request #5026 from deining/bump-gitHub-workflows
sidharthv96 Nov 9, 2023
0f2b941
Update packages/mermaid/src/diagrams/class/classRenderer-v2.ts
jgreywolf Nov 9, 2023
07dcb64
Merge branch 'develop' into 3952-lexical-ids
jgreywolf Nov 9, 2023
92f1644
Merge pull request #5025 from deining/clarify-docu
sidharthv96 Nov 9, 2023
a177141
Merge pull request #5028 from mermaid-js/3952-lexical-ids
sidharthv96 Nov 9, 2023
3c13386
Update packages/mermaid/src/docs/community/questions-and-suggestions.md
sidharthv96 Nov 9, 2023
b12b8a9
Merge pull request #4952 from ajdamico/patch-1
sidharthv96 Nov 9, 2023
aa5d586
Fix docs
sidharthv96 Nov 9, 2023
b134766
Add subgraph title margin config options to schema.
mathbraga Nov 11, 2023
0bcd5d2
Create helper function for subgraph title margin fetching.
mathbraga Nov 11, 2023
52ed387
Fix nesting of getSubGraphTitleMargins test.
mathbraga Nov 11, 2023
8b0a5be
Include subgraph margin into label positioning
mathbraga Nov 11, 2023
56c3809
Add logic to add subgraph title margin on layout
mathbraga Nov 12, 2023
adff22c
Update all patch dependencies
renovate[bot] Nov 13, 2023
fb031ee
Merge branch 'develop' into bug/4912_gitgraph-merge-routing-colouring
nirname Nov 13, 2023
6d0d8ac
Merge pull request #5033 from mermaid-js/renovate/patch-all-patch
sidharthv96 Nov 14, 2023
5fdbf5d
Merge pull request #5017 from ad1992/bug/4946-fix-svg-order-sequence-…
sidharthv96 Nov 14, 2023
33e94d3
Merge pull request #4961 from claesgill/upd_readme_toc
sidharthv96 Nov 14, 2023
0c0f7a7
Merge pull request #4934 from RounakJoshi09/bug/#3251_linkStyle-can't…
sidharthv96 Nov 14, 2023
c56025e
Merge pull request #5013 from SteffenLm/bug/5009_static_class_attribu…
aloisklink Nov 14, 2023
52603d7
Merge branch 'develop' into bug/4912_gitgraph-merge-routing-colouring
nirname Nov 14, 2023
862d20c
Merge branch 'develop' into other/remove-pr-labeler-action
sidharthv96 Nov 15, 2023
e8ee5f5
Merge pull request #4868 from mermaid-js/other/remove-pr-labeler-action
sidharthv96 Nov 15, 2023
3df7cf2
Merge branch 'develop' into bug/4912_gitgraph-merge-routing-colouring
nirname Nov 15, 2023
d7f59c1
Merge pull request #4927 from guypursey/bug/4912_gitgraph-merge-routi…
nirname Nov 15, 2023
a47a9e4
Merge branch 'develop' into refactor/unifyEdgeMarkers
sidharthv96 Nov 16, 2023
aadf533
Error Hash Removed
RounakJoshi09 Nov 17, 2023
c19fa12
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit
RounakJoshi09 Nov 17, 2023
453c16d
Remove unnecessary code
mathbraga Nov 17, 2023
7e77433
Add tests for subgraph title margin
mathbraga Nov 17, 2023
42ac630
Merge branch 'develop' into feature/4935_subgraph-title-margin-config…
mathbraga Nov 18, 2023
a1c0761
Update all minor dependencies
renovate[bot] Nov 20, 2023
36247bc
Merge pull request #5047 from mermaid-js/renovate/all-minor
sidharthv96 Nov 20, 2023
3ba0fee
Update all patch dependencies
renovate[bot] Nov 20, 2023
4a4e614
Merge pull request #5046 from mermaid-js/renovate/patch-all-patch
sidharthv96 Nov 20, 2023
ad6c761
Modify getSubGraphTitleMargins to use null coalescing operator
mathbraga Nov 20, 2023
c0a43f5
Change getSubGraphTitleMargins to accept config object as parameter
mathbraga Nov 20, 2023
63c2d36
Rename file and update imports
mathbraga Nov 20, 2023
fc3018e
Move subgraph title margin tests to independent file
mathbraga Nov 20, 2023
d61bfde
Replace string concat with string templates
mathbraga Nov 21, 2023
a935380
Merge branch 'feature/4935_subgraph-title-margin-config-option' of ht…
mathbraga Nov 21, 2023
d79671e
Resolve lint issue
mathbraga Nov 21, 2023
997a377
Merge branch 'develop' into feature/4935_subgraph-title-margin-config…
mathbraga Nov 21, 2023
fd208dd
update testTimeout from 5 seconds to 10 seconds
omer-priel Nov 21, 2023
9ae00eb
reset the testTimeout to 5 seconds and change it directly in the test
omer-priel Nov 23, 2023
f604017
Merge pull request #5055 from omer-priel/bug/5053_tests-failed-becaus…
aloisklink Nov 23, 2023
78e118c
fix: #5064 Handle case when line has only one point
sidharthv96 Nov 24, 2023
8f733c6
Merge branch 'master' into develop
sidharthv96 Nov 24, 2023
55ce05f
chore: Add tests for calculateDeltaAndAngle
sidharthv96 Nov 24, 2023
c0fcf4f
Merge branch 'develop' into 5064_EdgeOffsetEdgeCase
sidharthv96 Nov 24, 2023
26df818
chore: Update pnpm-lock
sidharthv96 Nov 24, 2023
7b0f6c1
fix Types
sidharthv96 Nov 24, 2023
b5ba095
Merge branch 'develop' into refactor/unifyEdgeMarkers
sidharthv96 Nov 24, 2023
61747b6
Merge pull request #5065 from mermaid-js/5064_EdgeOffsetEdgeCase
sidharthv96 Nov 24, 2023
5b705cf
v10.6.2-rc.1
sidharthv96 Nov 24, 2023
1ff7218
fix: flowchart image without text
bonyuta0204 Nov 22, 2023
65ee65b
Merge pull request #4915 from Patronud/develop
sidharthv96 Nov 25, 2023
3489fc4
Replace multiple calls of getConfig() for a single at top of the scope
mathbraga Nov 25, 2023
904be16
Merge branch 'develop' into feature/4935_subgraph-title-margin-config…
mathbraga Nov 25, 2023
ce875c9
Move getConfig() call out of recursiveRender to its parent caller
mathbraga Nov 26, 2023
2cc4f23
chore(deps): update all patch dependencies
renovate[bot] Nov 27, 2023
8406583
Merge pull request #5070 from mermaid-js/renovate/patch-all-patch
sidharthv96 Nov 27, 2023
952f2fb
chore(deps): update all minor dependencies
renovate[bot] Nov 27, 2023
62b991b
Merge pull request #5071 from mermaid-js/renovate/all-minor
sidharthv96 Nov 27, 2023
1d5378a
fix: clean comments in text in getDiagramFromText API so flowchart wo…
ad1992 Nov 27, 2023
4a4d715
remove unused variable
ad1992 Nov 27, 2023
7e11938
add test
ad1992 Nov 27, 2023
282da45
Merge branch 'develop' into aakansha/bug/5075-fix-getDiagramFromText-api
ad1992 Nov 27, 2023
7ca76b0
Merge pull request #5063 from bonyuta0204/bug/4736_zero_size_image_fl…
sidharthv96 Nov 27, 2023
25e9bb3
Merge pull request #4837 from mermaid-js/refactor/unifyEdgeMarkers
aloisklink Nov 27, 2023
4dbfa2f
review fixes
ad1992 Nov 27, 2023
d3d4948
Merge branch 'develop' into aakansha/bug/5075-fix-getDiagramFromText-api
ad1992 Nov 27, 2023
a807a58
Modify margin logic to avoid creating unnecessary space in subgraph
mathbraga Nov 28, 2023
7979b28
Add test for subgraphs with title margins and edge labels
mathbraga Nov 28, 2023
8e794e3
Merge branch 'feature/4935_subgraph-title-margin-config-option' of ht…
mathbraga Nov 28, 2023
5718be5
Merge branch 'develop' into feature/4935_subgraph-title-margin-config…
mathbraga Nov 28, 2023
fe4485c
update mermaidAPI to cleanup the text before passing to getDiagramFro…
ad1992 Nov 28, 2023
18bc2af
Update docs
ad1992 Nov 28, 2023
1f4e335
Merge branch 'develop' into pr/iwestlin/4288
sidharthv96 Nov 28, 2023
0620c6d
chore: Cleanup setupGraphViewbox
sidharthv96 Nov 28, 2023
403ac4b
chore: Fix computeWidth function
sidharthv96 Nov 28, 2023
9c2dae9
refactor: Remove unnecessary calculations
sidharthv96 Nov 28, 2023
89b3923
chore: Revert unnecessary export
sidharthv96 Nov 28, 2023
4ed7b2b
Add dummy commit to trigger GH checks
ad1992 Nov 28, 2023
005c998
test(e2e): fix pie chart E2E tests for PR #4288
aloisklink Nov 28, 2023
72d2d04
Merge pull request #5006 from lchenay/patch-1
aloisklink Nov 28, 2023
1564358
Merge pull request #4288 from iwestlin/fix/pie-chart-viewbox
sidharthv96 Nov 28, 2023
252a8a7
Merge pull request #5041 from mathbraga/feature/4935_subgraph-title-m…
sidharthv96 Nov 28, 2023
4499926
Merge pull request #5076 from ad1992/aakansha/bug/5075-fix-getDiagram…
sidharthv96 Nov 28, 2023
f35fb39
Referenced the PmWiki's Cookbook recipe enabling MermaidJs schematics…
d-faure Nov 28, 2023
ae7003a
Merge remote-tracking branch 'origin/develop' into PmWiki-integration
d-faure Nov 28, 2023
fdf9988
feat #5042: Add `flowchart.maxEdges` config.
sidharthv96 Nov 28, 2023
f81e4d4
Merge pull request #5085 from d-faure/PmWiki-integration
sidharthv96 Nov 29, 2023
c6bf908
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit
RounakJoshi09 Dec 3, 2023
31a1de1
Condition of Parent Id Without Merge Commit Added
RounakJoshi09 Dec 3, 2023
8de1bde
Split type from generic class name
jgreywolf Dec 4, 2023
f806de3
Merge branch 'develop' into sidv/5042_maxEdges
sidharthv96 Dec 4, 2023
d22ee8d
fix: Check if parentCommit is provided
sidharthv96 Dec 4, 2023
93a920c
test: Add unit test for generic classname and namespace
sidharthv96 Dec 4, 2023
761fa27
chore: Rename test
sidharthv96 Dec 4, 2023
886405b
Merge pull request #5098 from mermaid-js/4578-generic-class-in-namespace
sidharthv96 Dec 4, 2023
e87243c
chore(deps): update all minor dependencies
renovate[bot] Dec 4, 2023
160c7d3
fix: #5100 Add viewbox to sankey
sidharthv96 Dec 4, 2023
87a0ab3
Merge pull request #5099 from mermaid-js/renovate/all-minor
sidharthv96 Dec 4, 2023
1165fb1
Merge branch 'develop' into release/10.6.2
sidharthv96 Dec 4, 2023
60ea9a2
v10.6.2-rc.2
sidharthv96 Dec 4, 2023
80fa3e9
update docs
sidharthv96 Dec 4, 2023
798f9f8
chore: Downgrade node to 18.18.2
sidharthv96 Dec 4, 2023
a24f96e
Merge branch 'develop' into release/10.6.2
sidharthv96 Dec 4, 2023
6a31ae6
Merge pull request #4944 from RounakJoshi09/bug/#4497_unable-to-cherr…
aloisklink Dec 4, 2023
4a7e4a3
build: use `tsx` instead of `ts-node-esm`
aloisklink Dec 4, 2023
5d56835
Merge pull request #5104 from aloisklink/chore/use-tsx-instead-of-ts-…
sidharthv96 Dec 4, 2023
11affc3
Changes to .prettierignore
FutzMonitor Dec 4, 2023
239fad9
Grammar/rendering for setting style on class node
jgreywolf Dec 4, 2023
1ecae7d
Merge branch 'develop' into 2408-support-style-for-class
jgreywolf Dec 4, 2023
a9610d3
Merge pull request #5109 from FutzMonitor/issue5108
sidharthv96 Dec 5, 2023
fe07e9d
Merge pull request #5102 from mermaid-js/5100_SankeyViewbox
nirname Dec 5, 2023
ca386ab
Update docs
jgreywolf Dec 5, 2023
e25515a
Merge branch 'develop' into 2408-support-style-for-class
jgreywolf Dec 5, 2023
02b2d71
Update packages/mermaid/src/diagrams/class/classDb.ts
jgreywolf Dec 5, 2023
faf282b
build(deps-dev): bump vite from 4.4.9 to 4.4.12
dependabot[bot] Dec 5, 2023
cc4af0c
Merge pull request #5115 from mermaid-js/dependabot/npm_and_yarn/vite…
sidharthv96 Dec 6, 2023
1d08155
Update NiceGuy.io links in integrations-community.md
Abrifq Dec 6, 2023
f476c25
Update docs
Abrifq Dec 6, 2023
4f9988a
Merge pull request #5120 from Abrifq/patch-3
sidharthv96 Dec 7, 2023
3b7cabe
chore: Add maxEdges to secure list
sidharthv96 Dec 7, 2023
9b34adf
refactor: Move maxEdges out of flowchart config.
sidharthv96 Dec 7, 2023
69f3109
refactor: Move maxEdges out of flowchart config.
sidharthv96 Dec 7, 2023
d3257ce
Merge branch 'develop' into sidv/5042_maxEdges
sidharthv96 Dec 7, 2023
7c3bd9a
Merge branch 'develop' into release/10.6.2
sidharthv96 Dec 7, 2023
b60fc1b
fix: replace functional approaches with oop
rflban Dec 7, 2023
9f061c5
Merge pull request #5086 from mermaid-js/sidv/5042_maxEdges
sidharthv96 Dec 10, 2023
3bb005b
Merge branch 'develop' into 2408-support-style-for-class
jgreywolf Dec 10, 2023
b51ca4f
Address potential undefined
jgreywolf Dec 10, 2023
b92b344
Update docs
jgreywolf Dec 10, 2023
5a26edf
Update generics docs
jgreywolf Dec 11, 2023
f1a10d1
chore(deps): update all minor dependencies
renovate[bot] Dec 11, 2023
b7fa22d
Merge pull request #5131 from mermaid-js/renovate/all-minor
sidharthv96 Dec 11, 2023
6e64556
Merge pull request #5130 from mermaid-js/update-generics-documentation
sidharthv96 Dec 11, 2023
24957f4
Update packages/mermaid/src/diagrams/class/classDb.ts
jgreywolf Dec 11, 2023
3dce04e
Update packages/mermaid/src/docs/syntax/classDiagram.md
jgreywolf Dec 11, 2023
668bf32
Update packages/mermaid/src/diagrams/class/classDb.ts
jgreywolf Dec 11, 2023
70b4a37
Update docs
jgreywolf Dec 11, 2023
a71bdbd
Merge branch 'develop' into 2408-support-style-for-class
jgreywolf Dec 11, 2023
237518b
Update classDiagram.md
jgreywolf Dec 14, 2023
1babceb
Update classDiagram.md
jgreywolf Dec 14, 2023
7ec5bdc
Update docs
jgreywolf Dec 14, 2023
c5220bd
Fixed parser/tests
jgreywolf Dec 18, 2023
2b4940d
Merge branch '2408-support-style-for-class' of https://github.com/mer…
jgreywolf Dec 18, 2023
6028036
Merge pull request #5111 from mermaid-js/2408-support-style-for-class
jgreywolf Dec 20, 2023
44dcac7
update verbiage
huynhicode Dec 28, 2023
5cec92c
update verbiage
huynhicode Dec 28, 2023
54db85b
Adds Unison programming language to community integrations list
rlmark Jan 4, 2024
303e5be
adds corresponding change in docs/ecosystem
rlmark Jan 9, 2024
8383b1b
chore(deps): update all minor dependencies
renovate[bot] Jan 10, 2024
2b3dee6
Merge pull request #5180 from rlmark/develop
sidharthv96 Jan 10, 2024
34e0942
Merge pull request #5172 from mermaid-js/renovate/all-minor
sidharthv96 Jan 10, 2024
0ac3394
chore: Minor cleanup of imperativeState
sidharthv96 Jan 11, 2024
1b20fe9
Merge branch 'develop' into pr/rflban/4941
sidharthv96 Jan 11, 2024
54446f1
Merge pull request #4941 from rflban/fix/1294_exhaustive-clear-sequen…
sidharthv96 Jan 11, 2024
977a3f2
Merge branch 'develop' into release/10.6.2
sidharthv96 Jan 11, 2024
2516b20
Merge branch 'master' into develop
sidharthv96 Jan 11, 2024
1d4bb50
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
sidharthv96 Jan 11, 2024
26bab80
Merge branch 'develop' into release/10.6.2
sidharthv96 Jan 11, 2024
505689d
docs: Remove broken integration
sidharthv96 Jan 11, 2024
85e7010
Merge branch 'develop' into release/10.6.2
sidharthv96 Jan 11, 2024
6d1a38d
10.6.2-rc.3
sidharthv96 Jan 11, 2024
6ac8523
Merge pull request #5169 from mermaid-js/open-arrows
sidharthv96 Jan 11, 2024
3e5b395
v10.7.0
sidharthv96 Jan 11, 2024
904a200
Merge branch 'develop' into release/10.7.0
sidharthv96 Jan 11, 2024
e7d239b
Update integrations-community.md (Add Codemia to the list of producti…
markqian Jan 11, 2024
1c43e8e
Merge pull request #5189 from markqian/develop
huynhicode Jan 11, 2024
0e105af
Fix typo
sidharthv96 Jan 15, 2024
b46da49
Revert "Feature/4935 subgraph title margin config option"
sidharthv96 Jan 15, 2024
11542b3
Revert "fix: render the participants in same order as they are created"
sidharthv96 Jan 15, 2024
d91b3ce
Merge pull request #5197 from mermaid-js/revert-5041-feature/4935_sub…
sidharthv96 Jan 15, 2024
7508d9a
Merge pull request #5198 from mermaid-js/revert-5017-bug/4946-fix-svg…
sidharthv96 Jan 15, 2024
b3fa916
Merge branches 'master' and 'release/10.7.0' of github.com:mermaid-js…
sidharthv96 Jan 15, 2024
54307bb
Merge branch 'develop' of github.com:mermaid-js/mermaid into release/…
sidharthv96 Jan 15, 2024
d972ddd
docs: Add release version
sidharthv96 Jan 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 22 additions & 4 deletions .github/pr-labeler.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
'Type: Bug / Error': ['bug/*', fix/*]
'Type: Enhancement': ['feature/*', 'feat/*']
'Type: Other': ['other/*', 'chore/*', 'test/*', 'refactor/*']
'Area: Documentation': ['docs/*']
# yaml-language-server: $schema=https://raw.githubusercontent.com/release-drafter/release-drafter/master/schema.json
autolabeler:
- label: 'Type: Bug / Error'
branch:
- '/bug\/.+/'
- '/fix\/.+/'
- label: 'Type: Enhancement'
branch:
- '/feature\/.+/'
- '/feat\/.+/'
- label: 'Type: Other'
branch:
- '/other\/.+/'
- '/chore\/.+/'
- '/test\/.+/'
- '/refactor\/.+/'
- label: 'Area: Documentation'
branch:
- '/docs\/.+/'

template: |
This field is unused, as we only use this config file for labeling PRs.
2 changes: 0 additions & 2 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ categories:
change-template: '- $TITLE (#$NUMBER) @$AUTHOR'
sort-by: title
sort-direction: ascending
branches:
- develop
exclude-labels:
- 'Skip changelog'
no-changes-template: 'This release contains minor changes and bugfixes.'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: pnpm/action-setup@v2

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
cache: pnpm
node-version: 18
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
matrix:
node-version: [18.x]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2
# uses version from "packageManager" field in package.json

- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
cache: pnpm
node-version: ${{ matrix.node-version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-readme-in-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Check for difference in README.md and docs/README.md
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: check tests
if: github.repository_owner == 'mermaid-js'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: testomatio/check-tests@stable
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Dependency Review Action
#
# This Action will scan dependency manifest files that change as part of a Pull Reqest, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
#
# Source repository: https://github.com/actions/dependency-review-action
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
Expand All @@ -15,6 +15,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: 'Dependency Review'
uses: actions/dependency-review-action@v3
6 changes: 3 additions & 3 deletions .github/workflows/e2e-applitools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ jobs:
- if: ${{ ! env.USE_APPLI }}
name: Warn if not using Applitools
run: |
echo "::error,title=Not using Applitols::APPLITOOLS_API_KEY is empty, disabling Applitools for this run."
echo "::error,title=Not using Applitools::APPLITOOLS_API_KEY is empty, disabling Applitools for this run."

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2
# uses version from "packageManager" field in package.json

- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
node-version: [18.x]
containers: [1, 2, 3, 4]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2
# uses version from "packageManager" field in package.json

- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/link-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
# lychee only uses the GITHUB_TOKEN to avoid rate-limiting
contents: read
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Restore lychee cache
uses: actions/cache@v3
Expand All @@ -36,7 +36,7 @@ jobs:
restore-keys: cache-lychee-

- name: Link Checker
uses: lycheeverse/lychee-action@v1.8.0
uses: lycheeverse/lychee-action@v1.9.1
with:
args: >-
--config .github/lychee.toml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ jobs:
matrix:
node-version: [18.x]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2
# uses version from "packageManager" field in package.json

- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
cache: pnpm
node-version: ${{ matrix.node-version }}
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/pr-labeler-config-validator.yml

This file was deleted.

22 changes: 20 additions & 2 deletions .github/workflows/pr-labeler.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
name: Apply labels to PR
on:
pull_request_target:
types: [opened]
# required for pr-labeler to support PRs from forks
# ===================== ⛔ ☢️ 🚫 ⚠️ Warning ⚠️ 🚫 ☢️ ⛔ =======================
# Be very careful what you put in this GitHub Action workflow file to avoid
# malicious PRs from getting access to the Mermaid-js repo.
#
# Please read the following first before reviewing/merging:
# - https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target
# - https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
types: [opened, reopened, synchronize]

permissions:
contents: read

jobs:
pr-labeler:
runs-on: ubuntu-latest
permissions:
contents: read # read permission is required to read config file
pull-requests: write # write permission is required to label PRs
steps:
- name: Label PR
uses: TimonVS/pr-labeler-action@v4
uses: release-drafter/release-drafter@v5
with:
config-name: pr-labeler.yml
disable-autolabeler: false
disable-releaser: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: pnpm/action-setup@v2

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
cache: pnpm
node-version: 18
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/release-draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,19 @@ on:
branches:
- develop

permissions:
contents: read

jobs:
draft-release:
runs-on: ubuntu-latest
permissions:
contents: write # write permission is required to create a github release
pull-requests: read # required to read PR titles/labels
steps:
- name: Draft Release
uses: toolmantim/release-drafter@v5
uses: release-drafter/release-drafter@v5
with:
disable-autolabeler: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/release-preview-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
publish-preview:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: pnpm/action-setup@v2

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
cache: pnpm
node-version: 18.x
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: fregante/setup-git-user@v2

- uses: pnpm/action-setup@v2
# uses version from "packageManager" field in package.json

- name: Setup Node.js v18
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
cache: pnpm
node-version: 18.x
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
matrix:
node-version: [18.x]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2
# uses version from "packageManager" field in package.json

- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
cache: pnpm
node-version: ${{ matrix.node-version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-browserlist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
update-browser-list:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: npx browserslist@latest --update-db
- name: Commit changes
uses: EndBug/add-and-commit@v9
Expand Down
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
registry=https://registry.npmjs.org
auto-install-peers=true
strict-peer-dependencies=false
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ stats
.nyc_output
# Autogenerated by `pnpm run --filter mermaid types:build-config`
packages/mermaid/src/config.type.ts
# Ignore the files creates in /demos/dev except for example.html
demos/dev/**
!/demos/dev/example.html
3 changes: 3 additions & 0 deletions .vite/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ export const getBuildConfig = ({ minify, core, watch, entryName }: BuildOptions)
output,
},
},
define: {
'import.meta.vitest': 'undefined',
},
resolve: {
extensions: [],
},
Expand Down
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,22 @@ Try Live Editor previews of future releases: <a href="https://develop.git.mermai

<a href="https://mermaid-js.github.io/mermaid/landing/"><img src="https://github.com/mermaid-js/mermaid/blob/master/docs/intro/img/book-banner-post-release.jpg" alt="Explore Mermaid.js in depth, with real-world examples, tips & tricks from the creator... The first official book on Mermaid is available for purchase. Check it out!"></a>

## Table of content

<details>
<summary>Expand contents</summary>

- [About](#about)
- [Examples](#examples)
- [Release](#release)
- [Related projects](#related-projects)
- [Contributors](#contributors)
- [Security and safe diagrams](#security-and-safe-diagrams)
- [Reporting vulnerabilities](#reporting-vulnerabilities)
- [Appreciation](#appreciation)

</details>

## About

<!-- <Main description> -->
Expand Down
1 change: 1 addition & 0 deletions cSpell.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"città",
"classdef",
"codedoc",
"codemia",
"colour",
"commitlint",
"cpettitt",
Expand Down