Commit Graph

2936 Commits

Author SHA1 Message Date
Knut Sveidqvist 8f8ce2f142 Merge branch '3358-blocks-diagram' of github.com:mermaid-js/mermaid into 3358-blocks-diagram 2024-01-30 14:37:53 +01:00
Knut Sveidqvist 452cb83ad7 #3358 Review changes 2024-01-30 14:37:35 +01:00
Knut Sveidqvist 2f8f9dd341
Update packages/mermaid/src/diagrams/block/blockDB.ts
Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-01-30 14:36:38 +01:00
Knut Sveidqvist 4a14d997d1
Update packages/mermaid/src/diagrams/block/blockRenderer.ts
Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-01-30 14:18:58 +01:00
Knut Sveidqvist 10237976f3
Merge branch 'develop' into 3358-blocks-diagram 2024-01-30 13:21:47 +01:00
Sidharth Vinod 80c20a72b2
Remove MermaidConfigWithDefaults 2024-01-30 14:25:44 +05:30
Sidharth Vinod 2d92ffb085
fix: Redirect of old URLs 2024-01-30 13:41:47 +05:30
Knut Sveidqvist 4823cf5df4
Update packages/mermaid/src/diagrams/block/blockDB.ts
Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-01-30 08:52:59 +01:00
Knut Sveidqvist dae8a13e8a
Update packages/mermaid/src/defaultConfig.ts
Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-01-30 08:51:47 +01:00
Sidharth Vinod 0b087b71dc
Merge branch 'develop' into feature/2776_katex_math 2024-01-30 12:57:04 +05:30
Sidharth Vinod ea8d7ec5cc
Merge branch 'develop' into feature/3173_implement_until_keyword_in_gantt 2024-01-30 12:56:36 +05:30
Sidharth Vinod 78f1631c8f
Organize imports 2024-01-30 10:04:42 +05:30
Sidharth Vinod ff6988e875
chore: Address review comments
Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com>
2024-01-30 09:51:40 +05:30
Ronid1 cddca04885 add actor-bottom to docs 2024-01-29 12:39:39 -08:00
Ronid1 f737c9f6f9 add actor-bottom class 2024-01-29 11:42:23 -08:00
Ronid1 7e86d03dc9 Merge branch 'develop' of https://github.com/mermaid-js/mermaid into feature/4653-add_actor-top_class_to_sequence_diagram 2024-01-29 11:28:01 -08:00
Knut Sveidqvist bfa8111e14 #3358 Third set of changes after review 2024-01-29 17:32:27 +01:00
Knut Sveidqvist 5aab2ba1dd Merge branch '3358-blocks-diagram' of github.com:mermaid-js/mermaid into 3358-blocks-diagram 2024-01-29 16:25:02 +01:00
Knut Sveidqvist 37d7c7e2dd #3358 Second set of changes after review 2024-01-29 16:22:48 +01:00
Knut Sveidqvist 1965f69a10
Update packages/mermaid/src/schemas/config.schema.yaml
Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-01-29 15:29:26 +01:00
Sidharth Vinod 95dcd30324
Merge branch 'develop' into sidv/mindmapToTs 2024-01-29 16:53:21 +05:30
Sidharth Vinod 73293efcf3
Merge branch 'develop' into patch-2 2024-01-29 13:29:04 +05:30
Sidharth Vinod 4c551b2aca
Lint 2024-01-29 12:35:39 +05:30
Sidharth Vinod d21461fba0
Lint 2024-01-29 12:27:17 +05:30
Sidharth Vinod b51d8ff7ba
Convert svgDraw.ts 2024-01-29 12:16:21 +05:30
Sidharth Vinod 75ec719257
Rename svgDraw.js 2024-01-29 11:31:22 +05:30
Sidharth Vinod 13e052ff81
Fix styles.ts 2024-01-29 11:26:10 +05:30
Sidharth Vinod bde6a9ff4f
Rename styles.js 2024-01-29 11:21:42 +05:30
Sidharth Vinod 23d843b6d3
refactor: Remove db import from svgDraw 2024-01-29 11:21:12 +05:30
Sidharth Vinod cffac848ea
chore: Fix mindmapDb exports 2024-01-29 10:52:58 +05:30
Sidharth Vinod 9651d0c2da
refactor: Fix types and imports 2024-01-29 10:45:47 +05:30
Sidharth Vinod e1a23f10df
chore: Fix config type 2024-01-28 21:43:03 +05:30
Sidharth Vinod d346a77e3c
Convert MindmapRenderer.ts 2024-01-28 16:04:42 +05:30
Sidharth Vinod f069de5487
Convert MindmapDB.ts 2024-01-28 16:04:42 +05:30
Sidharth Vinod ba0bddf417
Add MermaidConfigWithDefaults 2024-01-28 16:04:42 +05:30
Sidharth Vinod f30c26485e
Cleanup svgDraw.js 2024-01-28 16:04:41 +05:30
Sidharth Vinod b71f4c7e54
Add MindmapDB type 2024-01-28 16:04:41 +05:30
Sidharth Vinod e046da10c2
Convert mindmap.spec.js 2024-01-28 16:04:40 +05:30
Sidharth Vinod 12dc3d8373
Rename files to TS 2024-01-28 16:04:40 +05:30
rowanfr 82c405289d
Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph 2024-01-27 18:41:01 -06:00
Reda Al Sulais 191ea24e29 make pie parser async 2024-01-27 21:17:23 +03:00
Reda Al Sulais 72a6fad1db Merge branch next into add-pie-langium-parser 2024-01-27 20:55:15 +03:00
Reda Al Sulais a2a99485f9
Merge branch 'mermaid-js:develop' into add-pie-langium-parser 2024-01-27 20:35:26 +03:00
Sidharth Vinod bc332e3124
Fix boundMessage type 2024-01-27 22:37:24 +05:30
Franck Zagala 8d2605d537 minor stylistic changes 2024-01-27 16:33:57 +00:00
Franck Zagala cc4dfeab1a fix minor mistake in parsing test 2024-01-27 12:32:15 +00:00
Franck Zagala 280525b4b1 merge develop; resolve minor conflicts in docs/syntax/gantt.md 2024-01-27 12:27:34 +00:00
Franck Zagala fd3f1caff6 add parsing unit test for after/until keywords 2024-01-27 11:27:28 +00:00
Sidharth Vinod 3b0c5c3e60
fix: Message width 2024-01-27 15:34:53 +05:30
Sidharth Vinod 52d276b010
chore: Update katex 2024-01-27 12:54:15 +05:30
Sidharth Vinod d1178c490b
Merge branch 'develop' into pr/NicolasNewman/2885
* develop: (47 commits)
  Changes to gantt.html 1. Added a Gantt diagram that demonstrates to users that hashtages and semicolons can be added to titles, sections, and task data. Changes to gantt.spec.js 1. Added unit tests to ensure that semicolons and hashtags didn't break the functionality of the gantt diagram when used in titles, sections or task data. Changes to /parser/gantt.spec.js 1. Added rendering tests to ensure that semicolons and hashtags in titles, sections, and task data didn't break the rendering of Gantt diagrams.
  Lint
  Remove echo
  RefTest
  Echo event
  Update cypress
  Fix applitools
  docs: fix lint
  docs: move community to Discord
  Swap condition blocks to avoid using negation
  Reposition const declaration to ideal place
  Change repetitive values into consts
  docs: fix swimm link
  add sequenceDiagram link e2e test
  Fix Update Browserslist
  Use pnpm/action-setup@v2
  Fix lint
  Delete docs/syntax/gantt.html
  Add more detailed docs for Gantt tasks
  Update docs
  ...
2024-01-27 12:49:35 +05:30
Ronid1 9ee5667580 Merge branch 'develop' of https://github.com/mermaid-js/mermaid into feature/4653-add_actor-top_class_to_sequence_diagram 2024-01-26 14:08:13 -08:00
Sidharth Vinod 7ca990d762
Merge branch 'develop' into fix/DompurifyHooks 2024-01-27 00:25:15 +05:30
Sidharth Vinod 7d0faa3fed
Merge branch 'develop' into bug/4358_suppress_error_rendering 2024-01-26 23:29:27 +05:30
Sidharth Vinod 327530fb9d
Merge branch 'develop' into pr/rhysd/4359
* develop: (171 commits)
  Lint
  Remove echo
  RefTest
  Echo event
  Update cypress
  Fix applitools
  docs: fix lint
  docs: move community to Discord
  Swap condition blocks to avoid using negation
  Reposition const declaration to ideal place
  Change repetitive values into consts
  docs: fix swimm link
  Fix Update Browserslist
  Use pnpm/action-setup@v2
  Fix lint
  Cleanup e2e.yml
  Ignore push events on merge queue
  Remove ::
  Remove ::
  Remove ::
  ...
2024-01-26 23:05:16 +05:30
Sidharth Vinod 91907fe0eb
Merge pull request #5095 from FutzMonitor/issue1981
Changes to Gantt Parsers to allow hashes and semicolons to titles, sections, and task data.
2024-01-26 17:21:58 +00:00
Sidharth Vinod 9bedfa2033
Merge pull request #5160 from vitorsss/fix/4212_actor_menus_sequence_diagram_popup
[Fix] Sequence diagram actor menu popup
2024-01-26 17:16:27 +00:00
FutzMonitor 59264a33d7 Changes to gantt.html
1. Added a Gantt diagram that demonstrates to users that hashtages and semicolons can be added to titles, sections, and task data.
Changes to gantt.spec.js
1. Added unit tests to ensure that semicolons and hashtags didn't break the functionality of the gantt diagram when used in titles, sections or task data.
Changes to /parser/gantt.spec.js
1. Added rendering tests to ensure that semicolons and hashtags in titles, sections, and task data didn't break the rendering of Gantt diagrams.
2024-01-26 11:48:48 -05:00
Ronid1 70d9f50fc9 add const for class name 2024-01-25 17:59:46 -08:00
Ronid1 b253cd65d4 update docs 2024-01-25 17:19:00 -08:00
Ronid1 f2f8d89a28 add actor-top class to rectangle actor and man actor 2024-01-25 17:16:09 -08:00
FutzMonitor 0b0f988180 Merge branch 'develop' into issue1981 2024-01-25 17:03:16 -05:00
Sidharth Vinod 1c200ee5bc
perf: prevent adding multiple DOMPurify hooks
Currently, everytime `removeScript()` is called, the same DOMPurify
hooks are getting added again and again.

Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-01-25 23:28:42 +05:30
Reda Al Sulais 55be75c974 Merge branch next into add-pie-langium-parser 2024-01-25 14:56:34 +03:00
Franck Zagala 099f580e52 address review comment on implementation; apply similar changes on existing impl of keyword 'after' 2024-01-24 09:30:21 +00:00
Sidharth Vinod 442da6c4a2
chore: Update tests 2024-01-24 14:03:43 +05:30
Sidharth Vinod f715863540
Fix types 2024-01-24 13:59:16 +05:30
Sidharth Vinod ed7dbb100d
refactor: Make parser.parse async 2024-01-24 13:50:45 +05:30
Sidharth Vinod 52fdea0419
refactor: Support async parsers
Add `Diagram.fromText`
2024-01-24 13:41:51 +05:30
steph cbf7e6a880 fix lint 2024-01-23 22:17:55 -08:00
steph 8982e2f78c add latest blog post 2024-01-23 22:02:24 -08:00
steph 62ae072918 update discord invite link 2024-01-23 21:59:54 -08:00
steph 04f92e5b1c remove holiday promo text 2024-01-23 21:58:37 -08:00
Sidharth Vinod 5cc20b5e44
Merge branch 'next' into feat/948_packetDiagram
* next: (316 commits)
  Lint
  Remove echo
  RefTest
  Echo event
  Update cypress
  Fix applitools
  Fix applitools
  docs: fix lint
  docs: move community to Discord
  Swap condition blocks to avoid using negation
  Reposition const declaration to ideal place
  Change repetitive values into consts
  docs: fix swimm link
  Fix Update Browserslist
  Use pnpm/action-setup@v2
  Fix lint
  Cleanup e2e.yml
  Ignore push events on merge queue
  Remove ::
  Remove ::
  ...
2024-01-24 00:58:55 +05:30
Sidharth Vinod ce9a9db33a
Merge branch 'develop' into next
* develop:
  Lint
  Remove echo
  RefTest
  Echo event
  Update cypress
  Fix applitools
2024-01-24 00:47:31 +05:30
Sidharth Vinod ec79ac200c
Lint 2024-01-23 23:53:48 +05:30
Sidharth Vinod ba46747cb0
Merge branch 'develop' into next
* develop: (35 commits)
  docs: fix lint
  docs: move community to Discord
  Swap condition blocks to avoid using negation
  Reposition const declaration to ideal place
  Change repetitive values into consts
  docs: fix swimm link
  Fix Update Browserslist
  Use pnpm/action-setup@v2
  Fix lint
  Delete docs/syntax/gantt.html
  Add more detailed docs for Gantt tasks
  Update docs
  Update packages/mermaid/src/docs/syntax/flowchart.md
  Update flowchart.md #5195
  Add tests for gitgraphs with unconnected branches
  Include logic for gitgraph with unconnected branches
  Include undefined on findClosestParent return types and update the function
  Remove unnecessary argument on findClosestParent call
  Use already defined const instead of method call
  Fix pnpm-lock by resetting it, sorry!
  ...
2024-01-23 20:01:40 +05:30
Sidharth Vinod 17066aab97
Merge branch 'master' of github.com:mermaid-js/mermaid into develop
* 'master' of github.com:mermaid-js/mermaid:
  docs: fix lint
  docs: move community to Discord
  Delete docs/syntax/gantt.html
  Add more detailed docs for Gantt tasks
  Update docs
  Update packages/mermaid/src/docs/syntax/flowchart.md
  Update flowchart.md #5195
2024-01-23 19:55:53 +05:30
Oleg A 427bcaa3f6
docs: fix lint 2024-01-23 19:53:42 +05:30
Oleg A 8fad1f55e2
docs: move community to Discord 2024-01-23 19:53:41 +05:30
rowanfr 140645b760
Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph 2024-01-22 23:58:19 -06:00
Sidharth Vinod 05e17c0bf0
Merge pull request #5161 from mathbraga/feature/5114_add_parallel_commit_config
Feature/5114 add parallel commit config
2024-01-23 04:40:24 +00:00
Matheus Braga 679f77dea5
Merge branch 'develop' into bug/5059_fix_external_connection_after_updating_edges 2024-01-22 20:22:50 -03:00
Matheus Braga 1bad612c51
Merge branch 'develop' into feature/5114_add_parallel_commit_config 2024-01-22 20:19:52 -03:00
Matheus B 81825f22f5 Swap condition blocks to avoid using negation 2024-01-22 20:09:20 -03:00
Matheus B e668698b5c Reposition const declaration to ideal place 2024-01-22 19:56:25 -03:00
Franck Zagala b44ec7dadd fix bad expected values in gantt units tests 2024-01-22 21:46:52 +00:00
Franck Zagala cafe932cbc implement until keyword in gantt charts 2024-01-22 20:11:27 +00:00
Knut Sveidqvist c85b24862d Merge branch 'develop' into 3358-blocks-diagram 2024-01-22 14:19:30 +01:00
Knut Sveidqvist fe89b9510d #3358 Adjusting docs and a bug fix for nested blocks 2024-01-22 14:14:54 +01:00
Matheus Braga e7c52bbf59
Merge branch 'develop' into bug/5059_fix_external_connection_after_updating_edges 2024-01-21 13:20:24 -03:00
Matheus B 2401f334ec Merge branch 'develop' of https://github.com/mathbraga/mermaid into feature/5114_add_parallel_commit_config 2024-01-20 21:07:53 -03:00
Matheus B 4f60a27472 Change repetitive values into consts 2024-01-20 20:57:58 -03:00
Reda Al Sulais c7eaee037e Merge branch next into add-sankey-langium-parser 2024-01-20 14:10:30 +03:00
Reda Al Sulais 2bbdd15031 docs: fix swimm link 2024-01-20 13:30:49 +03:00
rowanfr fa201ad9ad
Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph 2024-01-19 18:52:16 -06:00
Vitor Soares Silva c226358f65
Merge branch 'develop' into fix/4212_actor_menus_sequence_diagram_popup 2024-01-19 16:24:54 -03:00
Sidharth Vinod 1f37b6c91b
Fix lint 2024-01-19 23:28:43 +05:30
Sidharth Vinod c080522102
Merge branch 'develop' into issue1981 2024-01-19 23:18:53 +05:30
Sidharth Vinod d95fdfee94
Merge branch 'develop' into pr/Ronid1/5066
* develop: (122 commits)
  Cleanup e2e.yml
  Ignore push events on merge queue
  Remove ::
  Remove ::
  Remove ::
  Debug
  Debug
  Remove spec selector
  Handle edge cases in E2E
  Always run combineArtifacts
  Fix error message
  Fix cache save
  Update cache key
  Notify users
  Flatten uploaded images
  Flatten uploaded images
  Use pixelmatch for image comparison
  Run all tests
  Fix lint
  Update lockfile
  ...
2024-01-19 23:15:52 +05:30
Sidharth Vinod 413de284ed
Merge branch 'develop' into pr/NicolasNewman/2885
* develop: (130 commits)
  Cleanup e2e.yml
  Ignore push events on merge queue
  Remove ::
  Remove ::
  Remove ::
  Debug
  Debug
  Remove spec selector
  Handle edge cases in E2E
  Always run combineArtifacts
  Fix error message
  Fix cache save
  Update cache key
  Notify users
  Flatten uploaded images
  Flatten uploaded images
  Use pixelmatch for image comparison
  Run all tests
  Fix lint
  Update lockfile
  ...
2024-01-19 19:59:33 +05:30
Knut Sveidqvist d96425d19e #3358 Reviving arrow heads after merging develop 2024-01-19 14:57:45 +01:00
Sidharth Vinod 46552faa2e
Merge branch 'develop' into fix/4212_actor_menus_sequence_diagram_popup 2024-01-19 14:10:30 +05:30
Sidharth Vinod e8f655439d
Fix merge error 2024-01-19 13:59:53 +05:30
Sidharth Vinod c11093fa71
Update packages/mermaid/src/diagrams/flowchart/flowDb.ts
Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-01-19 13:49:10 +05:30
Sidharth Vinod af7282511a
Merge branch 'next' into sidv/FlowDB_TS
* next: (194 commits)
  Use pixelmatch for image comparison
  Run all tests
  Fix lint
  Update lockfile
  E2E test
  Use cache to store snapshots
  chore(deps): update all patch dependencies
  Change string concatenation to template literal
  Revert "Revert 5041 feature/4935 subgraph title margin config option"
  build(deps-dev): bump follow-redirects from 1.15.2 to 1.15.5
  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
  Run dev docs without npx
  Remove npx completely from run script
  Update docs
  Fix linters
  Removed volta requirement, leave pnpm only
  ...
2024-01-19 13:48:03 +05:30
Sidharth Vinod 58b6cf0174
Merge branch 'develop' into next
* develop: (50 commits)
  Use pixelmatch for image comparison
  Run all tests
  Fix lint
  Update lockfile
  E2E test
  Use cache to store snapshots
  chore(deps): update all patch dependencies
  Change string concatenation to template literal
  Revert "Revert 5041 feature/4935 subgraph title margin config option"
  build(deps-dev): bump follow-redirects from 1.15.2 to 1.15.5
  Run dev docs without npx
  Remove npx completely from run script
  Update docs
  Fix linters
  Removed volta requirement, leave pnpm only
  Fixed dead link
  build
  Update docs
  Updated contributing docs after review, minor fixes
  Updated gantt chart docs to show all config options
  ...
2024-01-19 13:46:10 +05:30
Sidharth Vinod 7abcb61afb
Merge branch 'develop' into bug/4813_Fix_Elk_title_arrow_styling 2024-01-19 12:44:50 +05:30
rowanfr ff5240c0bc
Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph 2024-01-18 22:37:43 -06:00
Soren L. Hansen e0ee9b1bc0
Add more detailed docs for Gantt tasks 2024-01-19 09:34:20 +05:30
arukiidou be8faae68c
Update packages/mermaid/src/docs/syntax/flowchart.md
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2024-01-19 09:22:38 +05:30
arukiidou 04ebf0ddc9
Update flowchart.md #5195 2024-01-19 09:22:38 +05:30
Matheus Braga 223c8c92cb
Merge branch 'develop' into bug/5059_fix_external_connection_after_updating_edges 2024-01-18 20:59:24 -03:00
Knut Sveidqvist d075766760 #3358 Doc updates after viewing the page 2024-01-18 18:03:37 +01:00
renovate[bot] fb7cd9ca40
chore(deps): update all patch dependencies 2024-01-18 16:17:34 +00:00
Sidharth Vinod 781065dee4
Merge pull request #5205 from mathbraga/revert-5197-revert-5041-feature/4935_subgraph-title-margin-config-option
Revert "Revert 5041 feature/4935 subgraph title margin config option"
2024-01-18 16:10:05 +00:00
Knut Sveidqvist bf64509216 Merge branch 'develop' into 3358-blocks-diagram 2024-01-18 17:07:34 +01:00
Sidharth Vinod 2525966853
Merge pull request #5132 from nirname/docs/2910_update-contributing-guidelines
Contribution documentation improvements
2024-01-18 15:59:47 +00:00
Knut Sveidqvist 173ba2ecf5 Final console.log removed 2024-01-18 15:48:40 +01:00
Knut Sveidqvist 8e147206d8 #3358 Removed logging som type fixes 2024-01-18 15:44:16 +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
rowanfr 3fad11e104
Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph 2024-01-17 22:40:19 -06:00
Alois Klink 8788b49351
Merge pull request #5192 from murdoa/bug/5191_fix_gantt_chart_padding_docs
Updated gantt chart docs to show all config options
2024-01-17 18:55:03 +00:00
Matheus B c77a6e156c Include logic for gitgraph with unconnected branches 2024-01-16 20:54:26 -03:00
Matheus B 02246f64d2 Include undefined on findClosestParent return types and update the function 2024-01-16 20:01:03 -03:00
Matheus B bf1edd99f9 Remove unnecessary argument on findClosestParent call 2024-01-16 19:37:52 -03:00
Matheus B 6f09bc7dc7 Use already defined const instead of method call 2024-01-16 19:34:16 -03:00
Matheus B 96ac2369b6 Change string concatenation to template literal 2024-01-16 15:36:31 -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
rowanfr 0c7e2e2364 Fixed linting error 2024-01-15 20:48:29 -06:00
rowanfr f693084065 Fixed configuration override on subgraphs
There was an issue with overriding the subgraphs with the main graphs direction which this commit fixes. It only overrides `rankdir` on the `setGraph` function so that the subgraph preserves it's `rankdir`. There is likely a better way of doing this by modifying the initialization of subgraph configuration to match the main graph when it comes to other elements in the JSON object which composes the graph label.

As we modify the codebase this added line can be deprecated once we add more modular control to subgraphs such as allowing custom spacing or configurations for them. As `rankdir` is the only thing one can set with the `direction` keyword that is the only variable being overwritten for now.
2024-01-15 20:21:01 -06:00
rowanfr a5ecc7a06d
Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph 2024-01-15 16:40:08 -06:00
Nikolay Rozhkov 36fdff8378 Merge branch 'develop' into docs/2910_update-contributing-guidelines 2024-01-15 13:17:47 +03:00
Sidharth Vinod d972ddd932
docs: Add release version 2024-01-15 14:27:48 +05:30
Sidharth Vinod 54307bb0f4
Merge branch 'develop' of github.com:mermaid-js/mermaid into release/10.7.0
* 'develop' of github.com:mermaid-js/mermaid:
  Revert "fix: render the participants in same order as they are created"
  Revert "Feature/4935 subgraph title margin config option"
  Update integrations-community.md (Add Codemia to the list of productivity tools using Mermaid.)
2024-01-15 13:55:04 +05:30
Sidharth Vinod b3fa9167a0
Merge branches 'master' and 'release/10.7.0' of github.com:mermaid-js/mermaid into release/10.7.0
* 'master' of github.com:mermaid-js/mermaid:
  add inadvertent tracking removal
  update announcement bar

* 'release/10.7.0' of github.com:mermaid-js/mermaid:
2024-01-15 13:39:25 +05:30
Sidharth Vinod 7508d9adc5
Merge pull request #5198 from mermaid-js/revert-5017-bug/4946-fix-svg-order-sequence-participant
Revert "fix: render the participants in same order as they are created"
2024-01-15 07:56:39 +00:00
Sidharth Vinod 11542b3b5d
Revert "fix: render the participants in same order as they are created" 2024-01-15 13:22:00 +05:30
Sidharth Vinod b46da49f85
Revert "Feature/4935 subgraph title margin config option" 2024-01-15 13:08:58 +05:30
Nikolay Rozhkov f6b321d769 Removed volta requirement, leave pnpm only 2024-01-13 15:19:36 +03:00
Steph d6d465d207 add inadvertent tracking removal 2024-01-12 07:54:19 -08:00
steph c96cc21692 update announcement bar 2024-01-11 22:42:09 -08:00
rowanfr 36c84b3fec
Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph 2024-01-11 18:31:53 -06:00
Nikolay Rozhkov a3092fc174 Fixed dead link 2024-01-12 02:00:30 +03:00
Nikolay Rozhkov 21ecc28b40 Merge branch 'develop' into docs/2910_update-contributing-guidelines 2024-01-12 01:41:00 +03:00
Nikolay Rozhkov 7219d604a9 Updated contributing docs after review, minor fixes 2024-01-12 01:32:07 +03:00
murdoa e52fcd0bdd Updated gantt chart docs to show all config options 2024-01-11 22:24:50 +00:00
Mark Qian e7d239b579 Update integrations-community.md (Add Codemia to the list of productivity tools using Mermaid.) 2024-01-11 12:09:53 -05:00
Sidharth Vinod 904a200620
Merge branch 'develop' into release/10.7.0
* develop:
  update verbiage
  update verbiage
2024-01-11 14:32:16 +05:30
Sidharth Vinod 3e5b395792
v10.7.0 2024-01-11 14:31:57 +05:30
Sidharth Vinod 6ac8523f78
Merge pull request #5169 from mermaid-js/open-arrows
DOCS: update Flowchart page
2024-01-11 05:41:16 +00:00
Sidharth Vinod 6d1a38d2ff
10.6.2-rc.3 2024-01-11 10:27:26 +05:30
Sidharth Vinod 85e7010689
Merge branch 'develop' into release/10.6.2
* develop:
  docs: Remove broken integration
2024-01-11 10:25:42 +05:30
Sidharth Vinod 505689de39
docs: Remove broken integration 2024-01-11 10:25:17 +05:30
Sidharth Vinod 26bab802c7
Merge branch 'develop' into release/10.6.2
* develop: (24 commits)
  chore: Minor cleanup of imperativeState
  add jetbrains blog post
  additional updates
  update latest news pages
  fix addl broken link
  fix link
  build: use `tsx` instead of `ts-node-esm`
  verbiage updates
  fix: replace functional approaches with oop
  feat: Track outbound links in plausible
  update getting started page
  add blog post
  chore: Update promo link
  docs: Holiday promo v2
  Update packages/mermaid/src/docs/.vitepress/components/TopBar.vue
  update announcements page
  update announcement bar verbiage
  chore: fix autogen docs
  chore(sequence): Update packages/mermaid/src/docs/syntax/sequenceDiagram.md
  chore(sequence): update doc for actors/participant creation/deletion fix
  ...
2024-01-11 10:23:24 +05:30
Sidharth Vinod 1d4bb50b32
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
* 'develop' of github.com:mermaid-js/mermaid:
  chore: Minor cleanup of imperativeState
  fix: replace functional approaches with oop
  chore: fix autogen docs
  chore(sequence): Update packages/mermaid/src/docs/syntax/sequenceDiagram.md
  chore(sequence): update doc for actors/participant creation/deletion fix
  chore: remove unused e2e tests file
  chore: add e2e test that shows db cleanup problem
  chore: add e2e test that shows db cleanup problem
  fix: add imperativeState and replace sequenceDb global variables with it
2024-01-11 10:23:04 +05:30
Sidharth Vinod 2516b20efc
Merge branch 'master' into develop
* master:
  add jetbrains blog post
  additional updates
  update latest news pages
  fix addl broken link
  fix link
  build: use `tsx` instead of `ts-node-esm`
  verbiage updates
  feat: Track outbound links in plausible
  update getting started page
  add blog post
  chore: Update promo link
  docs: Holiday promo v2
  Update packages/mermaid/src/docs/.vitepress/components/TopBar.vue
  update announcements page
  update announcement bar verbiage
2024-01-11 10:22:25 +05:30
Sidharth Vinod 977a3f2246
Merge branch 'develop' into release/10.6.2
* develop: (22 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 packages/mermaid/src/diagrams/class/classDb.ts
  Update docs
  ...
2024-01-11 10:19:00 +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
Sidharth Vinod 0ac339494f
chore: Minor cleanup of imperativeState 2024-01-11 09:42:56 +05:30
rowanfr 65fd3a3193
Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph 2024-01-10 19:06:55 -06:00
Sidharth Vinod 34e0942fa2
Merge pull request #5172 from mermaid-js/renovate/all-minor
chore(deps): update all minor dependencies (minor)
2024-01-10 17:10:14 +00:00
renovate[bot] 8383b1b9bc
chore(deps): update all minor dependencies 2024-01-10 15:44:22 +00:00
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
rowanfr 3bbd8fe4c9 Removed unnecessary function
Removed unnecessary function to pass test coverage CI
2024-01-07 23:08:42 -06:00
rowanfr beb308c5b3 Resolved issue with subgraph configuration
This commit resolves the issues with subgraph configuration, specifically for nodeSpacing and rankSpacing. This commit additionally adds an example graph to the `flowchart.html` to demonstrate this resolution. This commit resolves #3258
2024-01-07 05:56:53 -06:00
Knut Sveidqvist 818cb2fd76 #3358 Adding support for style statements 2024-01-05 20:56:57 +01:00
Nikolay Rozhkov 5f9b965be3 Linters 2024-01-05 21:05:10 +03:00
Nikolay Rozhkov 6d5f33856c Fixed redirects 2024-01-05 19:33:15 +03:00
Nikolay Rozhkov 17312a0232 Cleanup 2024-01-05 17:37:34 +03:00
Nikolay Rozhkov 3c27f46c57 Fixed dead links 2024-01-05 17:16:07 +03:00
Knut Sveidqvist 275e01acba #3358 Adding support for classDef and class statements 2024-01-05 15:13:15 +01:00
Nikolay Rozhkov 9aaf63139a Removed unused files 2024-01-05 16:53:31 +03:00
Nikolay Rozhkov 67dde70bec Fixes 2024-01-05 16:36:12 +03:00
Rebecca Mark 54db85bfea Adds Unison programming language to community integrations list 2024-01-04 13:27:02 -08: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
Nikolay Rozhkov 98cf63ebb2
Merge branch 'develop' into docs/2910_update-contributing-guidelines 2024-01-04 04:14:18 +03:00
Nikolay Rozhkov e7824f05cb Fixes for tutorials link 2024-01-04 04:07:56 +03:00
Nikolay Rozhkov a7d0d414b2 Small reorganizing 2024-01-04 03:56:45 +03:00
Nikolay Rozhkov 807a5bfab4 Batch of small improvements for the documentation 2024-01-04 03:37:47 +03:00
Reda Al Sulais 526d2a61f8
Merge branch 'mermaid-js:develop' into add-pie-langium-parser 2024-01-02 23:05:40 +03:00
Reda Al Sulais 54a09ead95 pref: remove `rearrangeRules` from `AbstractMermaidTokenBuilder` 2023-12-31 15:31:15 +03:00
Reda Al Sulais c2ea23f01f Merge branch next into add-pie-langium-parser 2023-12-31 15:21:47 +03:00
Steph 5cec92ceb3 update verbiage 2023-12-28 11:53:04 -08:00
Steph 44dcac7501 update verbiage 2023-12-28 11:34:46 -08:00
Matheus B c50a82a60e Build config types 2023-12-22 21:52:19 -03: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 41f3f9fb32 Fix linter issues 2023-12-22 21:48:19 -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 222c46e7f0 Implement support for parallel commits config 2023-12-22 21:08:15 -03:00
Matheus B 00ac6ccb37 Add parallelCommits config option for gitGraphs 2023-12-22 20:42:24 -03:00
Vitor Soares Silva e6bd1ae9dc
fix sequence diagram popup 2023-12-22 11:30:24 -03:00
Steph 749db745d0 add jetbrains blog post 2023-12-20 16:47:43 -08:00
Nikolay Rozhkov dfa0ad5b7a Refined contribution guide again 2023-12-21 03:41:21 +03:00
Ronid1 8002d9e2eb Merge branch 'develop' of https://github.com/mermaid-js/mermaid into docs/4974_reorder_integration_links 2023-12-19 18:17:58 -08:00
Steph f02114eaab
Merge pull request #5112 from mermaid-js/update-getting-started
Docs: update Getting Started page
2023-12-19 12:56:03 -08:00
Steph 2469419070 additional updates 2023-12-19 12:16:01 -08:00
Nikolay Rozhkov d2b9240a22 Simplify things 2023-12-19 04:33:38 +03:00
Nikolay Rozhkov 2705c0de03 Different fixes 2023-12-19 03:56:16 +03:00
Nikolay Rozhkov 3bc39409e5 Formatting 2023-12-19 02:55:20 +03:00
Nikolay Rozhkov 2f3f76fa24 Contribution guidelines rework 2023-12-19 02:48:22 +03:00
Nikolay Rozhkov 7b6764da20
Merge branch 'develop' into docs/2910_update-contributing-guidelines 2023-12-19 00:55:46 +03:00
Nikolay Rozhkov f66f4f438f Use deep outline for the whole documentation website 2023-12-19 00:54:33 +03:00
Matheus Braga ddd6e9ac73
Merge branch 'develop' into bug/5059_fix_external_connection_after_updating_edges 2023-12-18 17:12:44 -03:00
Justin Greywolf 2b4940d67d Merge branch '2408-support-style-for-class' of https://github.com/mermaid-js/mermaid into 2408-support-style-for-class 2023-12-18 06:27:30 -08:00
Justin Greywolf c5220bd92d Fixed parser/tests 2023-12-18 06:27:10 -08:00
Nikolay Rozhkov 0506ba872a Fixed linters 2023-12-17 13:35:49 +03:00
Steph 35224e5fe2 update latest news pages 2023-12-14 10:14:46 -08:00
Justin Greywolf 1babceb63c
Update classDiagram.md 2023-12-14 06:48:13 -08:00
Justin Greywolf 237518ba3b
Update classDiagram.md 2023-12-14 06:47:37 -08:00
Scott Blomquist 5e1f0c620a
Fix typos in timeline syntax samples 2023-12-12 12:48:07 -08:00
Steph aaea8cf45e fix addl broken link 2023-12-11 13:02:02 -08:00
Steph 97e07f8473 fix link 2023-12-11 12:31:22 -08:00
Alois Klink 3a816e7298 Merge branch 'chore/use-tsx-instead-of-ts-node-esm' into verbiage-updates 2023-12-11 16:55:24 +00:00
Alois Klink 41a9ac953a build: use `tsx` instead of `ts-node-esm`
`ts-node-esm` v10.9.1 is not compatible with Node.JS v18.19.0.

(cherry picked from commit 4a7e4a3bcb)
2023-12-11 16:55:06 +00:00
Justin Greywolf a71bdbd2bb
Merge branch 'develop' into 2408-support-style-for-class 2023-12-11 04:56:11 -08:00
Justin Greywolf 668bf327d5
Update packages/mermaid/src/diagrams/class/classDb.ts
Co-authored-by: Alois Klink <alois@mermaidchart.com>
2023-12-11 04:45:48 -08:00
Justin Greywolf 3dce04e0a9
Update packages/mermaid/src/docs/syntax/classDiagram.md
Co-authored-by: Alois Klink <alois@mermaidchart.com>
2023-12-11 04:45:16 -08:00
Justin Greywolf 24957f44df
Update packages/mermaid/src/diagrams/class/classDb.ts
Co-authored-by: Alois Klink <alois@mermaidchart.com>
2023-12-11 04:44:53 -08:00
Nikolay Rozhkov 01908b1278 Development Into planning 2023-12-11 05:22:58 +03:00
Nikolay Rozhkov 57f0a3aa8e Contribution documentation improvements 2023-12-11 05:08:42 +03:00
Justin Greywolf 5a26edf6c0 Update generics docs 2023-12-10 17:01:36 -08:00
Justin Greywolf b51ca4fb15 Address potential undefined 2023-12-10 13:25:16 -08:00
Justin Greywolf 3bb005b973 Merge branch 'develop' into 2408-support-style-for-class 2023-12-10 13:18:58 -08:00
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
Matheus Braga 7e1cc27c76
Merge branch 'mermaid-js:develop' into bug/5059_fix_external_connection_after_updating_edges 2023-12-08 13:15:09 -03:00
Matheus B 8bff32adab Modify algorithm to re-check for external connections after defining anchor nodes 2023-12-08 13:08:13 -03:00
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
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
Steph f363af482e verbiage updates 2023-12-07 10:14:33 -08:00
Faris Nabiev b60fc1b056 fix: replace functional approaches with oop 2023-12-07 11:32:49 +03:00
Sidharth Vinod 867686fe34
refactor: Address review comments 2023-12-07 11:27:48 +05:30
Sidharth Vinod 7c3bd9abd2
Merge branch 'develop' into release/10.6.2
* develop:
  Update docs
  Update NiceGuy.io links in integrations-community.md
  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`
  fix: #5100 Add viewbox to sankey
  fix: Check if parentCommit is provided
  Condition of Parent Id Without Merge Commit Added
  Error Hash Removed
  Linting Issue Fixed
  Updated gitgraph.md
  Linting Issue Fixed
  Documentation Modified New Ex Added
  e2e test case added
  Merge Conflict Resolved
  Suggested Changes FOR PR DONE
  documentation added, Tests Fixed
  All Unit Tests Passing
  Unit Test Cases Added
  Parser and Logic For Parent Commit Added
2023-12-07 11:02:52 +05:30
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 d3257cef80
Merge branch 'develop' into sidv/5042_maxEdges 2023-12-07 11:01:19 +05:30
Sidharth Vinod 69f31097e7
refactor: Move maxEdges out of flowchart config. 2023-12-07 10:55:12 +05:30