Commit Graph

1119 Commits

Author SHA1 Message Date
Knut Sveidqvist bf64509216 Merge branch 'develop' into 3358-blocks-diagram 2024-01-18 17:07:34 +01:00
Knut Sveidqvist 1230da7fc7 #3358 Some cleanup 2024-01-18 15:31:14 +01:00
Knut Sveidqvist a0d328d734 #3358 Removed logging, fixed som tests 2024-01-18 14:28:14 +01:00
Knut Sveidqvist bbc7fe6163 #3358 Fix for width of composite blocks 2024-01-18 10:22:09 +01:00
Matheus B 9213afbacd Add tests for gitgraphs with unconnected branches 2024-01-16 20:55:42 -03:00
Matheus Braga 8c7edebe93
Revert "Revert 5041 feature/4935 subgraph title margin config option" 2024-01-16 13:21:31 -03:00
Sidharth Vinod aab7631a9f
Merge branch 'develop' into next
* develop: (62 commits)
  Draft release on master
  docs: Add release version
  Revert "fix: render the participants in same order as they are created"
  Revert "Feature/4935 subgraph title margin config option"
  Fix typo
  add inadvertent tracking removal
  update announcement bar
  Update integrations-community.md (Add Codemia to the list of productivity tools using Mermaid.)
  v10.7.0
  10.6.2-rc.3
  docs: Remove broken integration
  chore: Minor cleanup of imperativeState
  chore(deps): update all minor dependencies
  adds corresponding change in docs/ecosystem
  Adds Unison programming language to community integrations list
  update verbiage
  update verbiage
  add jetbrains blog post
  additional updates
  Fixed parser/tests
  ...
2024-01-16 19:15:33 +05:30
Sidharth Vinod b46da49f85
Revert "Feature/4935 subgraph title margin config option" 2024-01-15 13:08:58 +05:30
Sidharth Vinod 1b20fe9723
Merge branch 'develop' into pr/rflban/4941
* develop: (200 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 docs
  Update NiceGuy.io links in integrations-community.md
  ...
2024-01-11 09:44:40 +05:30
Knut Sveidqvist 1d1875718d #3358 Sieblinmg height alignment 2024-01-08 15:48:59 +01:00
Knut Sveidqvist 7043892e87 #3358 Fix for layout where a siebling has wider siize 2024-01-08 14:03:42 +01:00
Knut Sveidqvist 809c450164 #3358 Support for adding tests and fixed issues for some shapes 2024-01-08 11:49:34 +01:00
Knut Sveidqvist 818cb2fd76 #3358 Adding support for style statements 2024-01-05 20:56:57 +01:00
Knut Sveidqvist 275e01acba #3358 Adding support for classDef and class statements 2024-01-05 15:13:15 +01:00
Knut Sveidqvist 72135c294e #3358 Edge labels 2024-01-04 16:28:13 +01:00
Knut Sveidqvist d0eca268ad #3358 Multiple arrows 2024-01-04 16:05:19 +01:00
Knut Sveidqvist 2ed4469029 #3358 Adding arrows to rendering 2024-01-04 14:15:30 +01:00
Matheus Braga f5ef0b600e
Merge branch 'develop' into bug/5059_fix_external_connection_after_updating_edges 2023-12-22 21:49:21 -03:00
Matheus B 46583cf4eb Merge branch 'develop' into feature/5114_add_parallel_commit_config 2023-12-22 21:32:20 -03:00
Matheus B eb3e924c44 Add tests for gitGraph with parallel commits 2023-12-22 21:11:50 -03:00
Sidharth Vinod d91934b219
comment out skipped test 2023-12-10 22:38:50 +05:30
Matheus B c8f0b39075 Add e2e test for edge case 2023-12-08 13:39:53 -03:00
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 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
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
RounakJoshi09 c6bf9083c8
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit 2023-12-04 00:19:28 +05:30
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
Alois Klink 005c998438 test(e2e): fix pie chart E2E tests for PR #4288 2023-11-28 11:37:12 +00: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 Braga 904be162a8
Merge branch 'develop' into feature/4935_subgraph-title-margin-config-option 2023-11-25 14:40:56 -03:00
Sidharth Vinod bcdd1c56bf
chore: Optimize dev server 2023-11-24 10:54:43 +05:30
Sidharth Vinod 94c3d7fb60
Merge branch 'next' into sidv/splitELK
* next: (39 commits)
  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
  fix linting
  fix: set proper shiki theme for light and dark modes
  fix: change shiki theme to github-light
  add latest blog post
  GitGraph: made reroute fn more readable
  GitGraph: simplified branch check in arrow rerouting fn
  GitGraph: added commit IDs to e2e test to remove false positives
  GitGraph: Moved branch curve check to within reroute check fn
  GitGraph: corrected minor typo in comment.
  GitGraph: added 2x e2e tests for branches not used immediately
  GitGraph: added branch checking to rerouting
  GitGraph: Added e2e tests for deferred branch use.
  GitGraph: e2e tests, added commit IDs to test graphs
  GitGraph: fixed an e2e branch for vertical branch
  ...
2023-11-24 09:55:31 +05:30
Sidharth Vinod a2db4a464a
Merge branch 'develop' into next
* develop: (39 commits)
  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
  fix linting
  fix: set proper shiki theme for light and dark modes
  fix: change shiki theme to github-light
  add latest blog post
  GitGraph: made reroute fn more readable
  GitGraph: simplified branch check in arrow rerouting fn
  GitGraph: added commit IDs to e2e test to remove false positives
  GitGraph: Moved branch curve check to within reroute check fn
  GitGraph: corrected minor typo in comment.
  GitGraph: added 2x e2e tests for branches not used immediately
  GitGraph: added branch checking to rerouting
  GitGraph: Added e2e tests for deferred branch use.
  GitGraph: e2e tests, added commit IDs to test graphs
  GitGraph: fixed an e2e branch for vertical branch
  ...
2023-11-24 09:54:02 +05:30
Sidharth Vinod 78e118c876
fix: #5064 Handle case when line has only one point 2023-11-24 09:42:21 +05:30
Sidharth Vinod fe7da97c5c
fix flow elk test 2023-11-23 22:51:08 +05:30
Sidharth Vinod c294a0a9ac
test: Add flowchart-elk overriding test 2023-11-23 22:41:22 +05:30
Knut Sveidqvist df858dc7b6 #3358 Adding arrows to syntax 2023-11-20 14:00:25 +01:00
Matheus Braga 42ac630304
Merge branch 'develop' into feature/4935_subgraph-title-margin-config-option 2023-11-17 21:41:27 -03:00
Matheus B 7e77433ef7 Add tests for subgraph title margin 2023-11-17 20:49:54 -03:00
RounakJoshi09 c19fa122af
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit 2023-11-17 11:28:20 +05:30
Sidharth Vinod b6983e4b21
Add title to tests 2023-11-15 00:59:34 +05:30
Sidharth Vinod 7c79bbd6b0
refactor: Address review comments
Moved some types around
Removed unnecessary params

Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com>
Co-authored-by: Alois Klink <alois@aloisklink.com>
2023-11-14 11:48:11 +05:30
Sidharth Vinod ce6bfcb7f5
Merge branch 'next' into feat/948_packetDiagram
* next: (193 commits)
  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
  Update docs
  Documentation: clarify sentence
  Fix lint
  Fix typo
  fix typo
  Add new Atlassian integrations
  chore(deps): update all patch dependencies
  Update demos/sequence.html
  chore: release v10.6.1
  fix
  fix
  fix: render the participants in same order as they are created
  fix(flow): fix invalid ellipseText regex
  ...
2023-11-14 11:21:15 +05:30
Sidharth Vinod 6ce543e118
Merge branch 'develop' into next
* develop: (126 commits)
  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
  Update docs
  Documentation: clarify sentence
  Fix lint
  Fix typo
  fix typo
  Add new Atlassian integrations
  chore(deps): update all patch dependencies
  Update demos/sequence.html
  chore: release v10.6.1
  fix
  fix
  fix: render the participants in same order as they are created
  fix(flow): fix invalid ellipseText regex
  ...
2023-11-14 11:20:27 +05:30
Nikolay Rozhkov fb031ee11a
Merge branch 'develop' into bug/4912_gitgraph-merge-routing-colouring 2023-11-13 23:14:42 +03:00
Guy Pursey d80e1a2662 GitGraph: added commit IDs to e2e test to remove false positives
Should stop randomised commit IDs from showing arbitrary
differences between test runs.
2023-10-31 17:24:13 +00:00
Guy Pursey f7d83e2cda GitGraph: added 2x e2e tests for branches not used immediately
My focus earlier on had been on relationship to `main` branch
so this is to ensure that we have some tests that cover
relationship between a pair of branches that doesn't
include `main`.
2023-10-31 17:24:13 +00:00
Guy Pursey adfe1728ae GitGraph: Added e2e tests for deferred branch use.
In these tests, a new branch is created but then a commit is made
on the main branch before the new branch gets a commit. This
important to see what happens with rerouting of arrows.

Suggested by @nirname in PR review of #4927.
2023-10-31 17:24:13 +00:00
Guy Pursey 2acad550da GitGraph: e2e tests, added commit IDs to test graphs
Followed practice of other tests so that commit IDs are
stabilised (i.e., not randomly generated) and therefore
don't show repeatedly in Cypress diff output screenshots
2023-10-31 17:24:13 +00:00
Guy Pursey b0b276898a GitGraph: fixed an e2e branch for vertical branch
Fix for error spotted by @mathbraga
2023-10-31 17:24:13 +00:00
Guy Pursey 25a678caec GitGraph: added e2e tests for multiple branches from one commit 2023-10-31 17:24:13 +00:00
Faris 61fb9e50d3
Merge branch 'develop' into fix/1294_exhaustive-clear-sequenceDb-variables 2023-10-30 13:39:09 +03:00
Knut Sveidqvist 7198fe55a9 Parsing of block arrows with directions, creating a dedicated new node for this. 2023-10-26 22:01:44 +02:00
Harshit Anand | Frontend Developer | ReactJS 3394541b41
Merge branch 'develop' into bug/4716_fix_target_blank_getting_sanitized 2023-10-26 14:57:15 +05:30
Harshit Anand 54ab3fc3b2 fix: added an e2e test case for classdiagram with anchor tag 2023-10-26 14:55:04 +05:30
Knut Sveidqvist fc28c1da63 Limiting the number of edges that are allowed in the flowchart 2023-10-25 11:06:37 +02:00
RounakJoshi09 58e9e5658b e2e test case added 2023-10-22 21:12:04 +05:30
Knut Sveidqvist d32c18a43c Merge branch 'master' into develop 2023-10-20 14:33:07 +02:00
Knut Sveidqvist 5619f8771b #3358 Adding support for space blocks and different shapes 2023-10-20 12:13:49 +02:00
Knut Sveidqvist 61bc293a95 #4967 Reverting optimimization that breaks subgraphs 2023-10-20 11:12:56 +02:00
Knut Sveidqvist a641fd51e8 #3358 Adding support for column statements 2023-10-15 22:21:25 +02:00
Faris Nabiev fc0ade2985 chore(sequence): update doc for actors/participant creation/deletion fix 2023-10-13 12:07:36 +03:00
Faris Nabiev 6eae46b927 chore: remove unused e2e tests file 2023-10-13 00:48:05 +03:00
Faris Nabiev 985eda2dee chore: add e2e test that shows db cleanup problem 2023-10-13 00:43:48 +03:00
Faris Nabiev 18ea27ac58 chore: add e2e test that shows db cleanup problem 2023-10-13 00:02:46 +03:00
NicolasNewman 6fa8a51a21 Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-10-11 10:46:45 -05:00
Marcel Ribeiro-Dantas 30b3e6213f
fix(typos): Fix minor typos in the source code
Signed-off-by: Marcel Ribeiro-Dantas <mribeirodantas@seqera.io>
2023-10-07 22:16:11 -03:00
Nikolay Rozhkov 936319b9ad
Merge branch 'develop' into feature/4269_add_xychart 2023-10-06 12:13:21 +03:00
Sidharth Vinod 3abe7cfc45
Merge branch 'develop' into next
* develop: (61 commits)
  Revert "fix: Reduce gantt exclude days length"
  Commented out broken test (#4913)
  fix: Reduce gantt exclude days length
  Update docs
  Fix lint issue
  Fix release version
  Fix TopBar
  Add MC to integrations
  Add TopBar
  Fix docs
  Docs: Add Product Hunt info (#4900)
  Update docs
  Merge branch 'release/10.5.0'
  Mermaid release v10.5.0
  docs: typo fixed
  docs: typo fixed
  Fix for issue with backticks in ids in classDiagrams
  more fixes
  fix typo
  more link fixes
  ...
2023-10-06 11:11:34 +05:30
Nikolay Rozhkov c63ea3e987
Commented out broken test (#4913)
* Commented out bronken test

* Skip test instead of commenting out

* Fix

* Update cypress/integration/rendering/gantt.spec.js

Co-authored-by: Alois Klink <alois@aloisklink.com>

---------

Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
Co-authored-by: Alois Klink <alois@aloisklink.com>
2023-10-06 04:45:13 +00:00
Knut Sveidqvist da79b371fe #3358 Recursive positioning paddings 2023-10-04 10:44:29 +02:00
Knut Sveidqvist c8d155c455 #3358 Recursive positioning 2023-10-03 20:12:33 +02:00
Knut Sveidqvist f00871a6b4 #3358 Recursive positioning 2023-10-03 14:19:08 +02:00
Knut Sveidqvist b4e32542e8 #3358 Recursive positioning 2023-10-03 12:56:47 +02:00
Subhash Halder 0d64d8d8e7 Merge branch 'develop' into feature/4269_add_xychart 2023-10-02 20:52:47 +05:30
Knut Sveidqvist 279c1ee6ba Merge branch 'master' into develop 2023-10-02 10:22:21 +02:00
Subhash Halder 8b04c2ce88 Merge branch 'develop' into feature/4269_add_xychart 2023-09-29 18:12:21 +05:30
Knut Sveidqvist 47acc1e423 Fix for issue with backticks in ids in classDiagrams 2023-09-29 13:38:00 +02:00
Sidharth Vinod 63f4a56ec5
chore: Add test for gantt rendering 2023-09-26 19:21:14 +05:30
Reda Al Sulais ca960c4f5f
Merge branch 'mermaid-js:develop' into chore/shorten-flow-huge-test-case 2023-09-22 13:31:25 +03:00
Reda Al Sulais bd861977ca chore: shorten `huge.html` using repeat 2023-09-22 13:16:15 +03:00
Sidharth Vinod 0534d758ce
Merge pull request #4860 from dreathed/bug/4849_center_axis_labels
bug/4849_center_axis_labels
2023-09-22 05:59:18 +00:00
Sidharth Vinod 2f6c1972e1
Update cypress/integration/rendering/quadrantChart.spec.js 2023-09-22 05:37:49 +00:00
Hans Blankenhaus de770e4c3c changed name of test 2023-09-21 15:42:36 +02:00
Hans Blankenhaus 05e94b430a add image snapshot test for quadrantchart 2023-09-21 15:25:51 +02:00
Reda Al Sulais 91eb824c21 Merge branch 'develop' into next
Signed-off-by: Reda Al Sulais <u.yokozuna@gmail.com>
2023-09-20 17:55:20 +03:00
Subhash Halder e56effa029 Merge branch 'develop' into feature/4269_add_xychart 2023-09-19 21:16:52 +05:30
Subhash Halder e061489b84 Added review changes 2023-09-19 21:09:31 +05:30
Sidharth Vinod e8347cedf3
Merge pull request #4846 from aloisklink/test/fix-theme-directives-e2e-test
Wait for `theme-directives.html` E2E test to render before taking a screenshot
2023-09-19 11:18:15 +00:00
Alois Klink 17f5052a6f test(e2e): wait for theme-directives.html
The `theme-directives.html` test currently sometimes takes a screenshot
before all of the Mermaid diagrams have completed rendering.

We can use the `urlSnapshopTest()` helper function, which waits until
a `.rendered` property exists on the page.

Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-09-17 18:56:20 +01:00
Alois Klink 518e277cb2 test(e2e): remove unused code in theme-directives
We don't use any font-awesome icons, or custom fonts in this file.
2023-09-17 18:55:54 +01:00
Alois Klink 335ba40dd0 test(e2e): wait for marker_unique_id.html e2e test
Sometimes, Cypress takes the screenshot for marker_unique_id.html early,
before mermaid has finished rendering the diagrams.

Fixes: 924c9e913b

Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-09-17 18:32:52 +01:00
Sidharth Vinod 75f1f9228d
test: Add rendering tests 2023-09-14 23:12:06 +05:30
Subhash Halder adb3cd16df Merge branch 'develop' into feature/4269_add_xychart 2023-09-14 20:50:27 +05:30
Sidharth Vinod 5aee43d05b
Merge branch 'develop' into next
* develop:
  Bump version
  chore: Fix type in 'getLineFunctionsWithOffset'
  Update cypress/platform/marker_unique_id.html
  refactor: Add getLineFunctionsWithOffset function
  refactor: Move EdgeData to types
  fix: PointStart marker refX
  Added cypress test
  chore(deps): update all patch dependencies
  refactor: Fix typings in utils.ts
  Give markers unique id's per graph
  chore: Add @internal to createCSSStyles
  chore: Bump version
  refactor: Remove unused variables
  fix: #4818 support `getClasses` in external diagrams.
2023-09-14 14:19:31 +05:30
Knut Sveidqvist 836d3a87be WIP 2023-09-14 10:11:43 +02:00
Chad Fawcett bceae92d30
Update cypress/platform/marker_unique_id.html
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-09-12 10:29:39 -07:00
Chad Fawcett 924c9e913b Added cypress test 2023-09-11 11:59:28 -07:00