Commit Graph

1183 Commits

Author SHA1 Message Date
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
Sidharth Vinod cd9bf03fb7
Merge branch 'develop' into pr/rhysd/4359
* develop: (154 commits)
  chore(deps): update all patch dependencies
  chore: release v10.6.1
  fix(flow): fix invalid ellipseText regex
  review fixes
  Update XYChart's nav link in the docs template
  add comment for ts ignore
  move decodeEntities to utils
  review fixes
  chore(deps): update all minor dependencies
  chore: Point to correct changelog
  add spec
  fix: getMessageAPI so it considers entity codes
  chore(deps): update all patch dependencies
  Update integrations-community.md
  docs: upate the list of tools with native support of mermaid
  Fix typo in build-docs.yml
  Updated mermaid version
  Limiting the number of edges that are allowed in the flowchart
  Update README.md
  Update README.md
  ...
2023-11-09 02:23:08 +05:30
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
Vincent Lam 6d2904cff1 Added linting 2023-10-25 17:38:34 -07:00
itsalam c08f927d60 Fixed styling for lines for ELK flowchart 2023-10-25 17:38:34 -07:00
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 577f0ca562
fix: Cypress test for Suppress Error 2023-09-16 13:54:43 +05:30
Sidharth Vinod 56d339b8f0
fix: Race condition when running suppressError test.
Co-authored-by: Alois Klink <alois@aloisklink.com>
2023-09-16 13:33:28 +05:30
Sidharth Vinod 5f41b65af1
chore: Add suppressErrorRendering to secure flags.
Co-authored-by: Alois Klink <alois@aloisklink.com>
2023-09-15 08:41:12 +05:30
Sidharth Vinod 0dbebe953b
Merge branch 'develop' into pr/rhysd/4359
* develop: (37 commits)
  fix: Arrow markers in flowchart-elk
  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.
  Remove unnecessary tests
  Remove optional chaining
  chore: Update docs
  refactor: Use `||` instead of `??`
  Update flowchart.md (#4798)
  ...
2023-09-14 23:33:39 +05:30
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
Sidharth Vinod 997c23befa
Merge branch 'develop' into next
* develop:
  Remove unnecessary tests
  Remove optional chaining
  refactor: Use `||` instead of `??`
  core: Adapt changes from 3f7bafb2d7
  Update cypress/helpers/util.js
  chore: Add deprecation notices, improve types
  chore: Cleanup gitGraph tests
  Update README.md
  refactor: Move setWrap to individual diagrams as necessary.
  refactor: Remove directives from grammar
  refactor: Update DBs to remove directive handling
  refactor: Move directive processing before parsing
  I refactored the code to improve its time complexity by removing unnecessary code and optimizing the existing code.
2023-09-08 16:36:45 +05:30
Subhash Halder b98217e3c3 Fix YAML themeVariables config 2023-09-07 13:31:52 +05:30
Subhash Halder fae648c253 Added the file name changes 2023-09-07 13:16:46 +05:30
Subhash Halder 9558cb9b16 Merge branch 'develop' into feature/4269_add_xychart 2023-09-07 12:55:22 +05:30
Subhash Halder 7c7d5881b7 Fixed all review comment 2023-09-07 12:45:22 +05:30
Sidharth Vinod 56aa503ded
Remove optional chaining 2023-09-07 08:31:05 +05:30
Sidharth Vinod 7d2b39f69f
refactor: Use `||` instead of `??` 2023-09-06 23:21:51 +05:30
Sidharth Vinod 4342759da7
Merge branch 'develop' into next
* develop:
  Update flowchart.md (#4798)
  Update flowchart.md (#4792)
  chore: Update docs
  Added missing integration tests and release version in docs.
  chore: Fix warning formatting
  docs: Disable showValues in sankey example
  Added support for millisecond and second to gantt tickInterval
  Use utf8 encoding in Jupyter example
2023-09-06 23:16:03 +05:30
Sidharth Vinod 8662b33de9
core: Adapt changes from 3f7bafb2d7
Co-authored-by: RohanHandore <110839432+RohanHandore@users.noreply.github.com>
2023-09-06 22:50:32 +05:30
Sidharth Vinod c212490248
Merge pull request #4778 from vertxxyz/feature/4771_tickInterval-support-for-sec-and-ms
Added support for millisecond and second to gantt tickInterval
2023-09-06 13:03:05 +00:00
Sidharth Vinod 65dabeaf15
Add test 2023-09-06 13:15:04 +05:30
Sidharth Vinod 0480339272
Add test 2023-09-06 13:09:06 +05:30
Knut Sveidqvist 1e864a508d Rendering, tmp commit before refactoring 2023-09-05 11:13:27 +02:00
Subhash Halder a344eb48f4 Added cypress test cases 2023-09-03 20:48:52 +05:30
Sidharth Vinod 697ac18872
Merge branch 'develop' into next
* develop:
  chore: Align with convention
  add additional test case
  added test case
  add sanitize text
  Update docs
  modifications to generic parser
  improvements to parseGenericTypes
  Update packages/mermaid/src/diagrams/class/svgDraw.js
  return comment
  add tsdoc comments
  update tests
  apply suggesitons
  Update packages/mermaid/src/diagrams/class/classTypes.ts
  Update packages/mermaid/src/diagrams/class/classTypes.ts
  update tests and db name
  Fix tests
  spec changes
  update classes to handle , in generic
  Update and add tests
  Create new type for member handling
2023-09-03 12:27:44 +05:30
Knut Sveidqvist 5fc99f1982 #3358 Adding db calls from node statements 2023-08-28 12:51:49 +02:00
Thomas Ingram 4efac6721d Added missing integration tests and release version in docs. 2023-08-28 20:17:15 +10:00
Justin Greywolf b513169f12 Merge branch 'develop' into UpdateClassMemberHandling 2023-08-26 14:01:42 -07:00
Sidharth Vinod 9bcfba6620
Merge branch 'develop' into next
* develop:
  fix(er): bug if relationship is declared first
  test(er): add cypress test on entity name alias
  feat(er): use square brackets to add aliases
  docs(er): add release version for entity name aliases
  feat(er): add entity name alias
2023-08-26 23:09:05 +05:30
Nikolay Rozhkov ed819e96d5
Merge pull request #4758 from tomperr/feat/4746_add_er_alias
feat(er): add entity name alias
2023-08-26 11:02:15 +00:00
Reda Al Sulais f202770b70 Merge branch develop into next 2023-08-26 13:44:24 +03:00
Justin Greywolf 8e64995047 Merge branch 'develop' into UpdateClassMemberHandling 2023-08-25 10:58:49 -07:00
Knut Sveidqvist 671ad82ad3 unique batches every time, if not repeated tests end up in the same batch 2023-08-25 14:13:11 +02:00
Sidharth Vinod a4ba192aad
Merge branch 'develop' into feat/4746_add_er_alias 2023-08-25 03:06:47 +00:00
Tom PERRILLAT-COLLOMB 4a06bc1a68 test(er): add cypress test on entity name alias 2023-08-22 13:53:37 +02:00
Sidharth Vinod f946c3da06
Merge branch 'develop' into next
* develop:
  chore: Remove circular dependency
  Update docs
  docs: Add frontmatter config demos
  docs: Add frontmatter config docs
  fix: XSS vulnerability
  chore: Minor typo fixes
  chore: Add test with both frontmatter and directive
  Update docs
  feat: Add support for config in frontmatter
  chore: Fix type in assignWithDepth
  refactor: Move `sanitizeDirective` into `addDirective`
  refactor: Rename and cleanup `directiveSanitizer`
2023-08-22 13:58:24 +05:30
Sidharth Vinod 844a175039
chore: Add test with both frontmatter and directive 2023-08-21 12:30:04 +05:30
Sidharth Vinod a6e6c3fb18
feat: Add support for config in frontmatter 2023-08-21 12:09:38 +05:30
Sidharth Vinod fd731c5ccd
Merge branch 'develop' into next
* develop: (56 commits)
  chore: Add comments on redirectMaps
  remove `chart` from `pie.spec.ts` description
  Update docs
  change `defaultConfig` type to `RequiredDeep` and use it in `pieDb`
  use `DiagramStylesProvider` in `pieStyles.ts`
  remove `setConfig` and `resetConfig` in pie
  add `structuredClone` in pie `getConfig`
  cleanAndMerge pieConfig
  remove cleanClone
  feat: Add cleanAndMerge and tests
  chore: Rename utils.spec.ts
  move db assignment from `beforeEach` to `beforeAll`
  create `structuredCleanClone` helper function
  add more types to pieRenderer
  add `resetConfig` to `clear` in pieDb
  rename `reset` to `resetConfig`
  use `structedClone` in `pieDb`
  remove `PieDiagramConfig` and import generated one
  remove unnecessary lines in pie files
  remove unused `HTML` import in pieRenderer
  ...
2023-08-20 20:28:52 +05:30
Justin Greywolf 9a9abac5b1 Merge branch 'develop' into UpdateClassMemberHandling 2023-08-15 10:08:42 -07:00
Reda Al Sulais 0d179c501e
Merge branch 'develop' into standardized-pie-definitions 2023-08-15 14:01:09 +03:00
Sidharth Vinod da7ff777d1
chore: Add esbuild (Breaking change)
mermaid.min.js and mermaid.js will now be IIFE instead of UMD.
2023-08-14 00:52:45 +05:30
Knut Sveidqvist c5e7e6040c Adding new flowchart tests related to issue #2139 2023-08-11 13:58:19 +02:00
Knut Sveidqvist c55a0947be #2139 Applying user defined classes properly when calculating shape width 2023-08-10 13:15:16 +02:00
Reda Al Sulais 71205f5bd6
Merge branch 'mermaid-js:develop' into standardized-pie-definitions 2023-08-05 21:33:03 +03:00
Reda Al Sulais 7d69ad2d5b Merge remote-tracking branch upstream/develop into standardized-pie-definitions 2023-08-02 15:54:23 +03:00
Ibrahim Wassouf 834c67ecaa Remove escaped quotes with backslash feature 2023-07-31 22:47:05 -03:00
Ibrahim Wassouf 844f9d96e7 Update and add new imgSnapshotTest 2023-07-29 22:16:28 -03:00
Ibrahim Wassouf 9eed2e278b Add imgSnapshotTest for escaped quotes 2023-07-27 09:29:26 -03:00
Ibrahim Wassouf 1df68f9a5f Remove class statement to show application of default class 2023-07-27 09:29:26 -03:00
Ibrahim Wassouf 1dfb400a46
Merge branch 'develop' into bug/4645_graph_node_containing_keyword 2023-07-26 16:59:54 -04:00
Ibrahim Wassouf 30a9b5574d Correct classDef and class grammar
Previously, you were allowed to define a class called 'default'
but were not allowed to use it because the classStatement grammar
expected an alphanum, which did not include the word DEFAULT
2023-07-25 20:35:08 -03:00
Knut Sveidqvist 15c6dfcbb5 Updates after tests 2023-07-25 16:43:09 +02:00
Sibin Thomas 99e88e4d0d
Merge branch 'develop' into feature/4451-vertical-branches-in-gitgraph 2023-07-20 16:03:19 +05:30
Sibin Thomas a171903088 added tests for overlapping commits 2023-07-20 13:15:05 +05:30
Yokozuna59 8cd8714aaf run pnpm lint:fix 2023-07-19 23:45:02 +03:00
Sidharth Vinod e25faeee4c
Update cypress/helpers/util.ts 2023-07-19 22:36:55 +05:30
Yokozuna59 66e5f8ae18
Merge branch 'develop' into convert-cypress-util-to-ts 2023-07-19 19:09:58 +03:00
Sibin Thomas 52a4f8f077 added tests for vertical branches 2023-07-19 20:22:59 +05:30
Sidharth Vinod e66135b67e
Merge pull request #4496 from moka-care/bug/4439_graph_doesnt_load_when_img_fail_to_load
Fix graph not loading when the img loads too fast or fail to load
2023-07-18 07:57:38 +00:00
Yokozuna59 072638ce9d
Merge pull request #4634 from leinelissen/develop
feat: allow specifying on which weekday a tickInterval should start
2023-07-18 07:33:08 +00:00
Yokozuna59 d9314a869a change deprecated `btoa` into `Buffer.from` 2023-07-17 15:58:58 +03:00
Yokozuna59 662eb431ab allow ts extension imports in cypress ts files 2023-07-17 15:53:26 +03:00
Yokozuna59 bed8710dbb
Merge branch 'mermaid-js:develop' into convert-cypress-util-to-ts 2023-07-17 15:31:11 +03:00
Sidharth Vinod d3006f6298
chore: Remove numbers from tests 2023-07-17 15:16:05 +05:30
Sidharth Vinod 24f04bb24d
Merge branch 'develop' into bug/4592_fix_newLine_padding_class_diagram 2023-07-17 15:11:39 +05:30
Sidharth Vinod b5bcc3b992
Revert "Refactor integration tests"
This reverts commit 80add648e6.
2023-07-17 15:11:14 +05:30
Lei Nelissen 0d7427ed20 chore: add cypress test 2023-07-14 14:13:18 +02:00
Ibrahim Wassouf bb220b8b87 Add test for string label 2023-07-13 16:53:29 -03:00
Ibrahim Wassouf 80add648e6 Refactor integration tests 2023-07-13 16:43:52 -03:00
Ibrahim Wassouf 12c657f514 Add imgSnapshotTests 2023-07-12 16:46:29 -03:00
Pierrick Wauquier 9e5ccbe13f
Merge branch 'develop' into bug/4439_graph_doesnt_load_when_img_fail_to_load 2023-07-11 17:10:19 +02:00
NicolasNewman f15e8c9edb Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-07-08 10:45:36 +09:00
Ibrahim Wassouf cd118ad5cb Update erDiagram to make entity names in singular form 2023-07-07 19:59:52 -03:00
Sidharth Vinod 0cdf801884
Fix import file extension 2023-07-07 17:21:18 +05:30
Sidharth Vinod 962ff73fc3
Batch by commit 2023-07-07 15:56:30 +05:30
Yokozuna59 f0bf6bf574
Merge branch 'develop' into convert-cypress-util-to-ts 2023-07-07 11:17:22 +02:00
Ibrahim Wassouf 42da53f58a Add imgSnapshotTest 2023-07-06 22:15:18 -03:00
Justin Greywolf 1d391d9408 Merge branch 'develop' into UpdateClassMemberHandling 2023-07-02 17:45:30 -07:00
Sidharth Vinod 19325777e5
Merge branch 'develop' into feature/1838_actor_creation_destruction 2023-07-02 10:32:59 +05:30
Nikolay Rozhkov abb7bb23d6 More detailed sankey docs 2023-07-02 02:34:22 +03:00
Nikolay Rozhkov 8ed2ee30ec Sankey alignment tests 2023-07-02 02:15:23 +03:00
Nikolay Rozhkov 084b765e9f Added tests for colors and fully setup cypress in Docker 2023-07-02 01:10:06 +03:00
Nikolay Rozhkov a62719826a Docker+Cypress, better run, removed unused syntax
Added cypress container (from their official image),
may be reconsidered later to choose our own
The only minor problem is node JS version mistmatch
package.json 18.16.0
docker-compose mermaid 18.16.1
docker-compose cypress 18.16.0

Host option in cypress docker container must be removed
in favor of possible configuration option.
http://localhost:9000 are currently hard-coded, that is bad

Updated ./run script with better documentation
and added some styles too it as well

Started sankey.spec.js as an example
2023-07-01 16:17:25 +03:00
Sidharth Vinod 3fe0c8b13d
Merge branch 'develop' into feature/1838_actor_creation_destruction 2023-06-30 16:00:24 +05:30
Justin Greywolf 3718274a1c Merge branch 'develop' into UpdateClassMemberHandling 2023-06-28 08:26:33 -07:00
Yokozuna59 2b0f078c99 resolve lint issues for `no-inferrable-types` 2023-06-27 21:09:26 +03:00
Yokozuna59 48fc60f866 fix wrong config paramater in some cypress spec
- flowchart
- mindmap
2023-06-27 20:59:43 +03:00
Yokozuna59 a2cf41c9c0
convert cypress/helpers/util.js into ts
- add types for parameter and returned value and variables
- change the deperated `unescape` into `decodeURIComponent`
- create `CypressConfig` and `CypressMermaidConfig` and `CodeObject` types
- add default value for some parameter
2023-06-27 20:53:01 +03:00
Yokozuna59 6cbd24f704 convert file from js into ts 2023-06-27 20:50:42 +03:00
Nikolay Rozhkov a38733346f Removed unnecessary configs and extra code 2023-06-25 21:56:14 +03:00
Nikolay Rozhkov db2a556f62 Cleanup 2023-06-25 00:23:42 +03:00
Nikolay Rozhkov 1674f12b62 Renamed sankey to sankey-beta 2023-06-24 23:11:54 +03:00
NicolasNewman 8b42302f9b Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-06-23 16:57:30 +09:00
Nikolay Rozhkov be9cd480aa Sankey syntax has beed reduced 2023-06-22 15:58:09 +03:00
Nikolay Rozhkov 272615e580 Fixed tests and added node alignment 2023-06-21 03:54:55 +03:00
Nikolay Rozhkov 8e001b92f2 Cleared sankey renderer 2023-06-19 01:02:50 +03:00
Yokozuna59 452e543e77
Merge branch 'develop' into standardized-pie-definitions 2023-06-17 14:43:51 +03:00
Yokozuna59 5aba2fed8b remove cy.get of info diagram 2023-06-17 00:01:54 +03:00
Yokozuna59 c17b723295 convert pie.spec.js to ts, remove cy.get and useless comment, add showData unit test case 2023-06-16 23:45:13 +03:00
Yokozuna59 ea3fbbd58d initial converting pie files 2023-06-16 23:05:06 +03:00
Sidharth Vinod 3011b7a1ea
Merge branch 'develop' into sidv/E2ECoverage
* develop:
  Rebuild
  Fix lint
  Changed C4 stereotype braces to «»
2023-06-16 23:23:40 +05:30
Sidharth Vinod 5c63c5ceae
Rebuild 2023-06-16 23:12:03 +05:30
Sidharth Vinod ecc4aa734b
Merge branch 'develop' into sidv/E2ECoverage
* develop: (43 commits)
  rename plugin variable into info in infoDetector.ts
  remove cypress/platform/index.html
  update pnpm-lock.yaml
  indent info.html files
  update pnpm-lock.yaml
  remove empty options in cypress info.spec.ts
  format and add theme to cypress info.html
  convert the cypress info.spec.js into ts
  add messing timeline and info demoes links
  change infoDb db export
  remove default export in info files
  resolve db import in info.spec.ts
  remove assigned variables to their variables and export db without default
  use object destructuring for getConfig in infoRenderer
  move default_info_db into infoDbOF
  remove id and diagram assigning in info loader
  assign returned variables to their variables
  remove handled `ts-ignore` in info diagram
  handle optional `.styles`
  add info fields interface
  ...
2023-06-16 20:31:52 +05:30
Sidharth Vinod 547358fc7e
Add coverage for E2E tests 2023-06-16 20:25:40 +05:30
Pierrick Wauquier 270586095f fix typo in test description 2023-06-16 16:37:34 +02:00
Pierrick Wauquier 8b6485035e add failing test 2023-06-16 16:32:11 +02:00
Yokozuna59 45f8fb4a84 remove cypress/platform/index.html 2023-06-16 00:05:39 +03:00
Yokozuna59 896a8a23ca indent info.html files 2023-06-15 23:51:03 +03:00
Yokozuna59 b7795ef12d
remove empty options in cypress info.spec.ts 2023-06-15 03:18:09 +03:00
Yokozuna59 35e81f3fd4 format and add theme to cypress info.html 2023-06-15 02:56:29 +03:00
Yokozuna59 7e639bec3a convert the cypress info.spec.js into ts 2023-06-15 02:41:07 +03:00
Justin Greywolf f4ffd5c965 Merge branch 'develop' into UpdateClassMemberHandling 2023-06-09 16:01:15 -07:00
Laura Valentine Tscharner d06bb05c5f feat(sequence): actor creation and destruction #1838 2023-06-08 17:17:31 +01:00
Knut Sveidqvist 81e86bc87c Merge branch '10.2.2' into develop 2023-06-08 15:07:31 +02:00
Sidharth Vinod 88b94dea66
Merge branch 'develop' into pr/MikeJeffers/4416
* develop: (45 commits)
  Add nextra to cSpell
  Update docs: Added Nextra to Blogs category on integrations page
  Render empty lines correctly
  Restore classes on edges for elk
  Update diagram proposal
  Update docs
  Added CKEditor and GitHub Writer to available integrations.
  Fix exceptions for empty lines
  chore(deps): update all patch dependencies
  build(deps): fix broken pnpm-lock.yaml file
  Mermaid version 10.2.0
  Mermaid Version 10.2.0-rc.4
  Label background fix
  Test commit
  Fix for regression error in sequenceDiagrams
  Update all minor dependencies
  Update all patch dependencies
  Update docs
  Add contributors profile url
  ignore ZenUML types
  ...
2023-06-08 00:16:49 +05:30
Sidharth Vinod f20ff4d580
Merge pull request #4436 from slab/zh-mermaid-empty-text
Fix exceptions for empty lines
2023-06-05 11:43:43 +05:30
Zihua Li 2a6603b33a Render empty lines correctly 2023-06-04 16:24:41 +08:00
Yoav Sternberg da1beb36bf Restore classes on edges for elk 2023-06-02 22:10:39 +03:00
Sidharth Vinod d148a65967
Merge branch 'develop' into sidv/zenuml
* develop: (22 commits)
  Update docs
  Added CKEditor and GitHub Writer to available integrations.
  chore(deps): update all patch dependencies
  build(deps): fix broken pnpm-lock.yaml file
  Mermaid version 10.2.0
  Mermaid Version 10.2.0-rc.4
  Label background fix
  Test commit
  Fix for regression error in sequenceDiagrams
  Fix visibility issue for fields
  fix parsing issue with class diagrams
  fix: Use unicode arrows in quadrant chart axis
  fix: Use unicode arrows in quadrant chart axis
  fix lint command
  Bump version
  Back to JS with jsdoc types
  Add unsupported text
  Reduce changes in test
  Fix deps
  Fix lockfile
  ...
2023-06-02 11:59:12 +05:30
Knut Sveidqvist 7b6cb4f974 #4446 Updating the cleanup criteria 2023-06-01 16:30:57 +02:00
NicolasNewman 0605b85d99 Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-05-31 17:27:42 +09:00
Justin Greywolf 0aa09bfca5 Create new type for member handling 2023-05-30 10:43:44 -07:00
Zihua Li ce9bdcc53f Fix exceptions for empty lines 2023-05-29 21:00:37 +08:00
Knut Sveidqvist 9c12c42a26 Mermaid Version 10.2.0-rc.4 2023-05-24 18:18:54 +02:00
Knut Sveidqvist bd616e0ef5 Test commit 2023-05-24 12:27:30 +02:00
Knut Sveidqvist 9fb25310e8 Fix for regression error in sequenceDiagrams 2023-05-24 11:27:17 +02:00
mikejeffers 9e6168111f add e2e test 2023-05-20 15:20:28 -04:00
Sidharth Vinod 97be4983f0
Merge branch 'develop' into sidv/zenuml
* develop: (66 commits)
  Update docs
  Update docs
  Improve the wording of security level values
  Added quadrantChart to the side bar
  Added e2e test cases with some fixes
  Added documentation for the quadrantChart
  Restructured the build function and addressed more review comment
  Fixed some parser issue and added test cases for the parser
  Fixed review comment
  Update docs
  Converted files to typescript and added proper types
  Fix blog linting
  Debug fetch-contributors
  Fix lockfile
  Revert "Replace esno & ts-node with tsx"
  [draft] Added support for quadrant chart
  Fix lockfile
  Fix build
  Update pnpm-lock
  Replace esno & ts-node with tsx
  ...
2023-05-16 23:26:35 +05:30
Subhash Halder 0f354ff974 Added e2e test cases with some fixes 2023-05-13 19:45:45 +05:30
NicolasNewman e7a1d8390c Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-05-06 17:32:15 +09:00
Justin Greywolf 06fdb95389 Allow overlapping notes 2023-05-03 22:15:59 -07:00
Sidharth Vinod 8b18fd93f4
Add test 2023-04-26 00:20:00 +05:30
Kazuki Tsunemi 95d8e3a5df Merge branch 'develop' into feature/class-namespace 2023-04-25 16:40:42 +09:00
Sidharth Vinod 05e7a6bd4b
Merge branch 'develop' into MultipleUpdatesToClassDiagram
* develop: (30 commits)
  Update vite
  Fix applitools cypress
  Update packages/mermaid/package.json
  chore(deps): update dependency typescript to v5
  fix typedoc
  fix(deps): update all minor dependencies
  chore(deps): update pnpm to v8
  chore(deps): update fregante/setup-git-user action to v2
  fix(deps): update all minor dependencies
  chore(deps): update dependency start-server-and-test to v2
  chore(deps): update dependency rimraf to v5
  chore(deps): update dependency eslint-plugin-unicorn to v46
  chore(deps): update actions/deploy-pages action to v2
  chore(deps): update dependency eslint-plugin-jsdoc to v43
  Split docs into build and deploy
  fix(deps): update dependency dompurify to v3
  chore(deps): update dependency concurrently to v8
  Split renovate groups
  Upgrade vitepress
  chore(deps): update pnpm to v7.30.5
  ...
2023-04-23 22:50:40 +05:30
Knut Sveidqvist 6ccdc2bd01 Fix for async handling flowchart-elk 2023-04-17 19:33:51 +02:00
Justin Greywolf 642bc1a739 update tests for package visibility 2023-04-17 07:24:27 -07:00
Kazuki Tsunemi 204baa4586 Merge branch 'develop' into feature/class-namespace 2023-04-17 11:27:10 +09:00
NicolasNewman e0e038d223 Merge branch 'develop' of https://github.com/NicolasNewman/mermaid to feature/2776_katex_math 2023-04-14 11:02:24 +09:00
Remco Haszing aa5c1a5f78
Merge branch 'develop' into fix-node16-module-resolution 2023-04-13 14:58:17 +02:00
NicolasNewman f3b939e03a Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-04-13 09:36:48 +09:00
Laura Valentine Tscharner 9bb0cef82b fix: wait for image rendering in nodes 2023-04-08 16:28:58 +01:00
Knut Sveidqvist fc1962c795 Version set 10.1.0 and fix for label centering 2023-04-04 14:36:05 +02:00
Knut Sveidqvist 1a56a18f9b Fixing issues with centering of labels for subgraphs and handling of special characters in html strings 2023-04-04 12:49:14 +02:00
Knut Sveidqvist 1841346ff6 Fixing issues in mindmaps and class diagram notes after tests 2023-04-04 10:45:39 +02:00
Knut Sveidqvist 2b9872d656 Some styling fixes for markdown strings 2023-04-04 08:29:15 +02:00
Knut Sveidqvist 5d536b9973 Adding documentation for markdown strings 2023-04-03 14:41:13 +02:00
Knut Sveidqvist 917a54f3cd
Merge branch 'develop' into 4220-string-synax-and-features 2023-04-03 12:31:56 +02:00