Commit Graph

588 Commits

Author SHA1 Message Date
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 5c63c5ceae
Rebuild 2023-06-16 23:12:03 +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 b7795ef12d
remove empty options in cypress info.spec.ts 2023-06-15 03:18:09 +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
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
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
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
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 917a54f3cd
Merge branch 'develop' into 4220-string-synax-and-features 2023-04-03 12:31:56 +02:00
Knut Sveidqvist 471c842a58 Adding rendering tests and unit tests 2023-04-03 12:12:51 +02:00
Remco Haszing da7725f38e
Merge branch 'develop' into fix-node16-module-resolution 2023-04-01 12:05:19 +02:00
Sidharth Vinod 7e610d13dc
Merge pull request #4207 from aloisklink/test/4198-fix-gantt-today-marker-tests
Fix broken Gantt  `todayMarker` tests
2023-03-31 18:23:06 +05:30
Knut Sveidqvist 057c9e4b81
Merge branch 'develop' into feature/1618_repeating_tasks 2023-03-31 08:42:10 +02:00
Sidharth Vinod 7739302ee8
fix uncaughexception in tests 2023-03-30 23:28:41 +05:30
Sidharth Vinod 46ab6f46f2
fix(#4256): Keep error diagram on screen 2023-03-30 23:09:46 +05:30
Jeremy Funk ba1c5dc6c7 Change to using display mode yaml 2023-03-25 01:56:50 +01:00
Jeremy Funk fd9680a050 Fix bug 2023-03-24 00:18:52 +01:00
Jeremy Funk 8c0550b2b7 Code refactoring, add e2e test 2023-03-23 23:45:59 +01:00
Kazuki Tsunemi 434961b44a Implement rendering logic 2023-03-15 13:26:51 +09:00
Remco Haszing b7d31adda4
Support node16 module resolution
The `node16` module resolution requires imports to use the `.js` file
extension in type definitions.

`@rollup/plugin-typescript` is needed to make this work with the Vite
setup used by Mermaid.

The module option for Mermaid internally is set to `nodenext`. This is
needed to support `.json` imports. Note that setting `module` to
`node16` or `nodenext` implies a matching `moduleResolution` value.
2023-03-11 14:54:21 +01:00
Alois Klink 58d4ba0d8f test(e2e): fix gantt `todayMarker` tests
The gantt diagram that were supposed to test whether
`todayMarker off` works wasn't working properly, because
`todayMarker on` wasn't working (i.e. the test never failed).

I've fixed this issue, and added a test that checks whether
`todayMarker on` works.

Fixes: https://github.com/mermaid-js/mermaid/issues/4198
2023-03-09 19:18:22 +00:00
Sidharth Vinod ad52d7d823
Merge pull request #4145 from Billiam/feature/move-pie-labels
Pie: Adding outer border, text position options
2023-03-05 00:33:15 +05:30
Nicolas Newman 12e1af44fc
Merge branch 'mermaid-js:develop' into feature/2776_katex_math 2023-03-03 20:14:17 -06:00
Billiam 8810b378b3 fixup! fixup! Move pie outerStrokeWidth to theme variables, update docs 2023-02-28 13:48:50 -06:00
Billiam 82f5b4ca39 Move pie outerStrokeWidth to theme variables, update docs 2023-02-28 13:27:09 -06:00
Sidharth Vinod e050a5aaa1
Fix test 2023-02-28 15:40:59 +05:30
Billiam 3bed70a0c5 fixup! fixup! feat(pie): adding outer border, text position options 2023-02-25 15:47:38 -06:00
Billiam b079fb4710 fixup! feat(pie): adding outer border, text position options 2023-02-25 15:43:16 -06:00
Billiam 6e4e529af2 feat(pie): adding outer border, text position options 2023-02-24 18:56:29 -06:00
Sidharth Vinod b13707fa7b
fix: Class label not visible if class is already defined 2023-02-24 13:46:56 +05:30
Sidharth Vinod 3b2d55efec
Merge branch 'develop' into sidv/classDiagramLabels
* develop: (85 commits)
  fix Lint
  Update CHANGELOG.md
  Update CHANGELOG.md
  fix: fix exports
  Fix readme link
  Regenerate mermaid docs
  Add deepdwn to cspell
  Add Deepdwn to native integrations list
  docs: Fix changelog
  docs: v10 breaking changes
  Remove `null` from diagrams before render
  fix docs diagram
  Updated version
  Minor cleanup to trigger build.
  Fix spellings
  Wrap option working in test case
  Fix typos
  Minor cleanup
  Removed the deprecated use of mindmap in Demo
  Minor cleanup
  ...
2023-02-24 13:28:28 +05:30
NicolasNewman 7dd21d85ba fix(katex): disabled 4th katex cypress test due to recent changes to error handling in develop 2023-02-23 15:16:23 -06:00
NicolasNewman ebef1c4f6b chore: merged with develop 2023-02-23 14:08:58 -06:00
Sidharth Vinod 555d4f2cdc
Fix spellings 2023-02-21 13:27:37 +05:30
Per Brolin ec5fa31a11 Wrap option working in test case 2023-02-21 07:00:51 +01:00
pbrolin47 22b18a4320
Merge pull request #4113 from mermaid-js/3192_invisible_edges
Adding the ability to use invisible edges
2023-02-20 14:40:43 +01:00
Knut Sveidqvist b6cac3a431 #3192 Adding docs and visual test 2023-02-20 11:19:23 +01:00
Sidharth Vinod 3e480612c7
Merge branch 'release/10.0.0' into sidv/splitDiagrams
* release/10.0.0:
  Skip elk
2023-02-20 00:36:33 +05:30
Sidharth Vinod 4c7306d808
Skip elk 2023-02-20 00:36:13 +05:30
Sidharth Vinod f66b524585
Merge branch 'release/10.0.0' into sidv/splitDiagrams
* release/10.0.0:
  Skip all elk tests as it's flaky
2023-02-20 00:31:13 +05:30
Sidharth Vinod 5de5598069
Skip all elk tests as it's flaky 2023-02-20 00:30:27 +05:30
Sidharth Vinod 638362baea
Merge branch 'release/10.0.0' into sidv/splitDiagrams
* release/10.0.0: (333 commits)
  10.0.0-rc.3
  Export more types
  no side effects
  10.0.0-rc.2
  skip failing elk test
  Cleanup
  Update docs
  fix(#3406, #3394): Remove init & initThrowsErrors
  chore: Rename lazy loaded diagram definitions
  Skip flowchart-elk failing test
  Fix docs
  fix Server
  Fix lint
  Remove Readme
  Fix E2E Tests
  Fix tests
  feat: Break render and parse types
  chore: Remove all non async render/parse/init
  Remove CJS builds from docs
  chore: Remove cjs from build
  ...
2023-02-19 20:18:26 +05:30
Sidharth Vinod 1691d48b2e
skip failing elk test 2023-02-19 18:26:13 +05:30
Sidharth Vinod 8363552c3a
Skip flowchart-elk failing test 2023-02-19 14:52:08 +05:30
Sidharth Vinod ef4fbd8bb3
classLabel tests 2023-02-14 00:54:42 +05:30
Nicolas Newman 58bc6c7f02
Merge branch 'mermaid-js:develop' into feature/2776_katex_math 2023-02-13 11:34:05 -06:00
NicolasNewman b243609e87 chore(katex): merged with branch develop 2023-02-13 11:32:31 -06:00
Sidharth Vinod d562a81019
Merge branch 'develop' into timeline
* develop: (45 commits)
  Showcase section to the docs - keepings docs up to date (#4055)
  bugfix: add missing d3 curves to flowchart and docs
  fix(deps): update dependency dagre-d3-es to v7.0.8
  build(pre-commit): cache eslint in pre-commit
  build(lint): cache eslint with strategy content
  Update cypress/integration/rendering/sequencediagram.spec.js
  feat(er): allow leading underscore for attributes name
  ci(lint): show nice error on lint failure
  chore: add moment to dependencies
  Update docs
  Update mindmap.md
  chore: remove moment-mini
  docs(readme-ch): fix twitter link
  build(lint): cache prettier on `pnpm run lint`
  fix: moment-mini default exporter
  docs(readme): update broken twitter badge
  test(er): improve tests on multiple key constraints
  Fixes Typo, remove console.log
  doc(er): add documentation on multiple key constraints
  feat(er): allow multiple constraints on attributes
  ...
2023-02-08 15:57:09 +05:30
Sidharth Vinod 8d6d90021a
Update cypress/integration/rendering/sequencediagram.spec.js 2023-02-05 11:54:56 +05:30
ashishj df1e9c4117 Added rendering test cases 2023-01-25 17:46:23 +01:00
Sidharth Vinod ead4037963
chore: Enable 57-elk test 2023-01-24 16:00:59 +05:30
Sidharth Vinod fb6ba231d0
chore: Skip 57-elk test 2023-01-24 15:59:37 +05:30
Olivier Leveau 250f1f9687 Merge branch 'develop' into feature/AddBoxForSeqDiagrams 2023-01-18 11:35:39 +01:00
Sidharth Vinod ded83b2ce7
Fix title 2023-01-16 02:17:25 +05:30
Sidharth Vinod 1c8c69f8db
Merge branch 'sidv/properlyWaitTests' into sidv/internalFCV3
* sidv/properlyWaitTests:
  feat: Wait for rendering to finish before taking image snapshots
  Update docs
  chore(deps): update all non-major dependencies
  Fix: Too many `primaryBorderColor`
2023-01-16 02:11:59 +05:30
Sidharth Vinod 4d3f151cf0
feat: Wait for rendering to finish before taking image snapshots 2023-01-16 02:07:37 +05:30
Sidharth Vinod ee056e1ac3
test: Update width 2023-01-12 19:47:39 +05:30
Sidharth Vinod 242a508d50
feat: Flowchart-elk integration 2023-01-12 18:26:08 +05:30
Olivier Leveau e659601e03 Add Box support in Sequence Diagrams 2023-01-05 15:40:40 +01:00
nekikara d8aa44f0c5 fix typos accessing techn property in drawC4Shape function 2022-12-24 20:25:59 +01:00
Knut Sveidqvist 1bf636d697
Merge pull request #3892 from mahomedalid/feature/3771_string_length
Adding support for parenthesis in the er diagram attribute types.
2022-12-16 12:58:30 +01:00
Per Brolin 88357ba751 Merge branch 'release/9.3.0' of github.com:mermaid-js/mermaid into release/9.3.0 2022-12-08 14:17:11 +01:00
Per Brolin 98fc866444 Minor change of test code 2022-12-08 14:16:25 +01:00
Knut Sveidqvist c6fce2431b Fixes for tests 2022-12-08 14:14:31 +01:00
Maho Pacheco 4dadf8a72d Adding support for parentheses 2022-12-06 10:38:21 -08:00
Ashley Engelund (weedySeaDragon @ github) f036d58ec3 Merge remote-tracking branch 'MERMAID/develop' into feat/3626-aria-descBy-roledescription-mocks
# Conflicts:
#	cypress/integration/rendering/gantt.spec.js
#	cypress/integration/rendering/requirement.spec.js
#	docs/config/setup/modules/mermaidAPI.md
#	packages/mermaid/src/accessibility.js
2022-12-01 10:08:44 -08:00
Knut Sveidqvist 650ee31cd1
Merge pull request #3845 from mermaid-js/sidv/eslintCleanup
Housekeeping with eslint-unicorn
2022-11-30 11:53:16 +01:00
Sidharth Vinod 1f147b6b63
Merge branch 'develop' into sidv/mermaidDocs
* develop:
  chore(deps): update pnpm to v7.17.1
  chore(deps): remove dependency on `graphlib`
  test(e2e): make gitgraph snapshots consistent
2022-11-28 16:13:27 +05:30
Alois Klink 51119f22df test(e2e): make gitgraph snapshots consistent
Add a commit id to 'should render a simple gitgraph with a title',
as otherwise the gitgraph renderer picks a random commit ID, and so
image snapshots will be different.
2022-11-27 18:54:41 +00:00
Ashley Engelund (weedySeaDragon @ github) 626a4741c0 Merge remote-tracking branch 'MERMAID/develop' into feat/3626-aria-descBy-roledescription-mocks 2022-11-25 11:30:44 -08:00
Sidharth Vinod ab81b508ce
Merge branch 'develop' into sidv/mermaidDocs
* develop: (79 commits)
  chore: docs:build
  chore: docs:build
  tiny fix and change: "The/y cannot" -> "Cannot..."
  remove 'horz' from  cSpell.json
  update demos/state.html to includ examples; formatting
  add 'horz' to cSpell (in pieDetector.ts commented out barChart work)
  refine - what is not done yet
  remove 'horz' from  cSpell.json
  Revert "Added pie"
  chore: Fix cSpell in pieRenderer
  update demos/state.html to includ examples; formatting
  add 'horz' to cSpell (in pieDetector.ts commented out barChart work)
  refine - what is not done yet
  remove console stmt
  #3831 Re-enabling themes for er diagrams
  #3835 Adding path to list of elements to be styled
  #3882 fix for issues with mindmaps  with only a single node
  chore(deps): update pnpm to v7.17.0
  docs: Remove warning in readme
  chore(deps): update lycheeverse/lychee-action action to v1.5.4
  ...
2022-11-23 15:57:06 +05:30
Sidharth Vinod 7f4368415d
chore: Add eslint-unicorn & fix 2022-11-23 01:05:08 +05:30
Knut Sveidqvist 29a02d1ab5
Merge pull request #3809 from aloisklink/use-dagre-d3-es
Replace `dagre`/`dagre-d3` with `dagre-d3-es`
2022-11-21 13:31:35 +01:00
Mason Malone a11ab3d5ea Disallow leading whitespace before delimiter 2022-11-19 12:52:49 -08:00
Mason Malone 70f024735b Add title support using YAML frontmatter 2022-11-18 20:42:54 -08:00
Alois Klink 537a627b75 test(e2e): test for mindmap before snapshot
Sometimes, the mindmap e2e tests take a snapshot when the mindmap
SVG has been created, but hasn't yet been fully rendered.

This adds a quick check for a mindmap section root, so that the
snapshot is only taken after the mindmap diagram has started
rendering.

I was also running into JSDoc ESLint warnings, so I moved the file
into a TypeScript file to fix those warnings.
2022-11-18 18:31:14 +00:00
Alois Klink 57edcfe87d test(e2e): remove unused mermaid.spec.js file
All tests have been moved to `mindmap.spec.js` in a previous commit.
2022-11-18 18:07:40 +00:00
Alois Klink b9dcdb00a5 test(e2e): move mindmap tests to mindmap.spec.js
Currently, we have mindmap tests in the
cypress/integration/rendering/mermaid.spec.js which is a bit
odd. They should probably all be in the mindmap.spec.js file.
2022-11-18 17:58:17 +00:00
Ashley Engelund (weedySeaDragon @ github) 0adc6a6112 remove a11y from individual diagrams; now happens in mermaidAPI render 2022-11-17 12:28:11 -08:00
Ashley Engelund (weedySeaDragon @ github) 03a11e103e (minor) fix typo 2022-11-17 12:19:31 -08:00
Sidharth Vinod beab2278d8
feat: Async mermaid docs 2022-11-14 22:06:26 +05:30
Knut Sveidqvist 4c779beda9
Merge pull request #3729 from DarkNami/feature/1598_add_tick_interval
feat(gantt): Add option 'tickInterval' for custom tick interval
2022-11-01 13:50:38 +01:00
DarkNami 3166f689f9 feat(gantt): Add option 'tickInterval' for custom tick interval
See issue #1598
2022-10-27 16:47:42 +08:00
Ashley Engelund (weedySeaDragon @ github) 599d035daf merge MERMAID/develop into branch 2022-10-25 07:42:57 -07:00
Knut Sveidqvist f4bb978a87
Merge pull request #3649 from DKurilo/feat/3247-statements-aliases
add statement aliases for ER diagram
2022-10-25 14:46:29 +02:00
Knut Sveidqvist 27a68819bc
Merge pull request #3647 from DKurilo/feat/1414-notes-to-class-diagram
add the way to add notes to class diagram
2022-10-25 14:45:03 +02:00
Santosh Viswanatham c71b6e31f7
Merge branch 'develop' into feat/3601-cspell-configuration 2022-10-18 21:02:38 +05:30
Dima Kurilo 20751a6496 fix cypress tests for erDiagram, add eslint-plugin-no-only-tests plugin because of this comment: https://github.com/mermaid-js/mermaid/pull/3647#issuecomment-1281163858 2022-10-17 13:20:17 -04:00
Dima Kurilo 75e11b1fde add basic render (cypress) test for classDiagram-v2 too 2022-10-17 12:33:23 -04:00
Dima Kurilo cead1f36f4 add basic render (cypress test for notes 2022-10-17 12:13:22 -04:00
Dima Kurilo 3108e896b6 add renedering (cypress) tests 2022-10-17 12:03:51 -04:00
Alois Klink 989d716c36
style: fix @cspell/eslint warnings
Ignores some names of contributors, and adjusts some capitilization
spacing to fix all cspell warnings.
2022-10-16 10:23:23 +01:00
Ashley Engelund (weedySeaDragon @ github) d1f3b889d6 add cypress tests for classDefs and applying classes to states 2022-10-11 08:33:43 -07:00
Knut Sveidqvist 646f76d343 Fix for broken test 2022-10-07 14:36:25 +02:00
Elliot Nelson 4e4b5ccf8d feat(git): allow cherry-pick to suppress tag altogether 2022-09-18 09:22:35 -04:00
Elliot Nelson ae920eaa93 feat(git): cherry-pick keyword supports tag attribute 2022-09-17 23:57:32 -04:00
Alois Klink a25c9a30d0 text(e2e): give git tests consistent commit id
gitGraph render tests are currently using random commit ids,
which causes visual regression tests to fail.

I couldn't find a way to make the random commit IDs consistent
(JavaScript/Cypress doesn't seem to have a random.seed() function),
so I've just hardcoded all the commit ids.
2022-09-14 04:15:52 +01:00
Alois Klink 05b8a6e77f test(e2e): widen flowchart width to within 10%
Widen flowchart width acceptable values to within 10% of 300px.
On my local environment, I'm getting 283px, which is 5.5% of 300px.
2022-09-14 04:15:52 +01:00
Knut Sveidqvist 01106caa59 Merged typescript changes 2022-09-05 11:22:17 +02:00
Knut Sveidqvist 047b7023a2 Updated with cloud and bang shapes 2022-09-05 09:54:00 +02:00
Knut Sveidqvist ccb16e5f5a Adding cloud and bang shapes 2022-09-02 11:08:26 +02:00
Knut Sveidqvist 68f8010ab9 Merge branch 'develop' into minmaps 2022-09-01 13:42:21 +02:00
Knut Sveidqvist 63c385a5d7 Adding some rendering tests 2022-08-30 21:36:17 +02:00
Ashish Jain d7e0888801
Merge pull request #3361 from aloisklink/feature/3356_git_custom_merge_commit_id
feat(git): allow custom merge commit ids
2022-08-30 17:50:57 +02:00
Knut Sveidqvist 6ab0eef6f3 Merge branch 'develop'
Conflicts:
	cypress/platform/knsv.html
2022-08-28 14:22:56 +02:00
Knut Sveidqvist 080bde0bc2 #2824 Updated regressionstest afters diagram sizing changes 2022-08-28 11:39:22 +02:00
Knut Sveidqvist e6e7bdcb55 #2824 Size changes and updated regressionstest afters diagram sizing changes 2022-08-28 11:25:09 +02:00
Knut Sveidqvist 2968b400c4 Updated viewBox settings 2022-08-27 15:03:29 +02:00
Knut Sveidqvist d0d5739ab0 Merge branch 'develop' into minmaps 2022-08-27 12:35:30 +02:00
Alois Klink b2f5ba3ee8
feat(git): allow custom merge commit ids
Currently, merge commits can have a git tag, but they cannot have a
custom git commit ID.

This commit allows modifying the default merge commit id.
It also displays all merge commits IDs, which undoes
3ccf027f42
2022-08-25 23:42:39 +01:00
Valentin Valls 0583c4fa25 Added 'ms' duration 2022-08-24 22:26:39 +02:00
FlorianWoelki 19a9f90186 test(e2e): add array and generic attributes erDiagram test 2022-08-20 15:15:05 +02:00
Knut Sveidqvist 9b54feab84 Merge branch 'develop' into minmaps 2022-08-06 10:53:54 +02:00
Knut Sveidqvist afe343e94f Changes after merge 2022-08-06 10:49:32 +02:00
Knut Sveidqvist b0074bf723
Merge pull request #3222 from leon19/bugfix/incorrect-label-padding
fix: remove right padding when a label contains HTML entities
2022-08-04 13:06:46 +02:00
Knut Sveidqvist aa9149912d Merge branch 'bug/3011_multiline_alignment' of github.com:hype09/mermaid into hype09-bug/3011_multiline_alignment 2022-08-04 13:05:17 +02:00
Muhammad Faisal Bin Arba'in 9ee43c0b7a snapshot test for more 8 branches with commits 2022-08-01 19:41:54 +08:00
Knut Sveidqvist ffe520db06 Curved edges 2022-07-29 15:06:21 +02:00
Lorens León c40368b0fa fix: remove right padding when a label contains HTML entities
Decode the HTML entities from the label text before adding them to the
HTML this prevents a miss-calculation of the label text length
2022-07-26 21:50:36 +02:00
Knut Sveidqvist 8681e78e50 Fixes for rendering tests 2022-07-20 14:39:01 +02:00
Knut Sveidqvist dee9cfea85 Reverting to cypress 9.7 in order to get applitools back in the game 2022-07-20 11:32:21 +02:00
MOREL Matthieu 648b15b00b Upgrade Cypress 2022-06-19 14:36:54 +02:00
ashishj e3df38e078 #3080 Added more rendering test for cherry pick functionality 2022-06-07 20:52:52 +02:00
ashishj c147404d1c #3080 Added support for cherry pick commits 2022-06-07 20:32:43 +02:00
ashishj 90d187c48a #3080 Added rendering test cases 2022-06-07 18:52:38 +02:00
Knut Sveidqvist bd459fadd3 2022-05-31 20:35:44 +02:00
Ronald Heggenberger 7372ca5e8e Adding "Critical Region" and "Break" blocks 2022-05-21 09:31:06 +02:00
ashishj 85062ac570 #3046 Add support for cyclic themeVariable rotation for more than 8 branches 2022-05-17 19:15:50 +02:00
Knut Sveidqvist eadbf595ba Adding applitools to inegration tests 2022-05-10 20:33:55 +02:00
Knut Sveidqvist 65143a0182 #2732 Regression fixes for accessibility 2022-05-06 19:42:40 +02:00
Knut Sveidqvist bada661bd0 Merge branch 'develop' of github.com:mermaid-js/mermaid into develop 2022-04-28 18:45:22 +02:00
Knut Sveidqvist d914e23626 Fix for hideUnusedParticipants 2022-04-28 18:45:18 +02:00
ashishj 5aac0734d5 Fix for broken Requirement diagram cypress test 2022-04-28 18:26:31 +02:00
Yash-Singh1 4c93870580 feat: add hideUnusedParticipants and some cleanup 2022-04-14 19:19:18 -07:00
Knut Sveidqvist 7d2e77a1b3
Merge pull request #2915 from gwincr11/cg-req-access
feat: Add accessibility fields to requirements diagram
2022-04-12 07:19:40 +02:00
Cory Gwin 3d7cb212c0 feat: Add accessibility fields to requirements diagram 2022-04-07 18:02:48 +00:00
Adam B 65b0b83625 Adds accDescription, draws tags to svg 2022-04-07 10:05:54 -04:00
Nicolas Newman f67254cdc7 Merge branch 'develop' of https://github.com/mermaid-js/mermaid into feature/2776_katex_math 2022-04-02 08:09:11 -09:00
Nicolas Newman cc2c828e78 feat(katex): added cypress testing 2022-04-02 08:00:56 -09:00
ashishj bbac11a4b8 Updated rendering test with fixed id 2022-03-31 19:49:42 +02:00
Knut Sveidqvist f6421734a2 Merge branch 'develop' into 1252_gitgraph_reinvented 2022-03-31 19:16:31 +02:00
Knut Sveidqvist fca58aafb1 Test updates when switching to cypress-image-snapshoits 2022-03-31 19:14:37 +02:00
Knut Sveidqvist 3c0a2f0fd0 chore: replacing percy with cypress-image-snapshots 2022-03-31 18:06:04 +02:00
ashishj 3ee141ff9b Added Gitgraph docs 2022-03-24 20:28:30 +01:00
Ashish Jain a7c33b7d5a Replacing master to main in test cases 2022-03-17 19:19:25 +01:00
Ashish Jain 1ef58e286c Fixed rendering test cases 2022-03-17 19:07:16 +01:00
Ashish Jain 21c97f9521 added rendering tests 2022-03-10 20:08:56 +01:00
Guy Adler 04454cece0
fix: changed open and close markers as recommended
chnged from `()(` and `())` to `(((` and `)))`
2022-02-17 17:22:38 +01:00
Guy Adler e1f0e69263
feat(flowchart): implement double circle node
The implementation uses two circles, inside each other.
A double circle node is opend with `()(` and closed with `)()`.
2022-02-16 23:05:46 +01:00
Eirik Bjornset d3577eb59b fix: bug #2346 "ER-attribute comments not work" 2021-12-29 21:27:51 +01:00
Knut Sveidqvist 9c12502a36 #2560 Tetsing that the added css have balanced brackets 2021-12-14 23:54:31 +01:00
Knut Sveidqvist d0cf3fc96a Merge 2021-12-08 11:55:49 +01:00
Knut Sveidqvist e0a05f83d1 Lint fix 2021-12-08 08:42:12 +01:00
Knut Sveidqvist 3526e35012 Fix for node with wrong type 2021-11-30 20:28:51 +01:00
Knut Sveidqvist a018789026 Merge remote-tracking branch 'origin/develop' into develop 2021-11-30 19:24:10 +01:00
Knut Sveidqvist d9e598aa7f testcommit 2021-11-30 19:12:39 +01:00
Yash-Singh1 a3b2ba736d feat(flowchart): Allow default in the node ID 2021-11-25 13:48:28 -08:00
Matthieu MOREL d84be0d792 Enable eslint-plugin-jest, eslint-plugin-cypress and wider scan 2021-11-18 23:57:16 +01:00
Knut Sveidqvist 69ecb02375 Merge branch 'develop'
Conflicts:
	dist/mermaid.core.js
	dist/mermaid.core.js.map
	dist/mermaid.esm.min.mjs
	dist/mermaid.js
	dist/mermaid.js.map
	dist/mermaid.min.js
	dist/mermaid.min.js.map
2021-11-04 21:23:29 +01:00
Ashish Jain 250c9beff9 #2425 Added new test case 2021-10-21 19:45:15 +02:00
Ashish Jain a06f6f9604 Add sanitize to properties and link in Sequence Diagram 2021-10-07 21:48:44 +02:00
Ashish Jain aa666d1829 Merge branch 'release/8.13.2' into develop 2021-09-29 20:22:57 +02:00
Knut Sveidqvist 8ee3155f2a Fix for broken test 2021-09-29 20:20:44 +02:00
Ashish Jain 38ef061175 Reverting PR #2312 2021-09-29 18:22:35 +02:00
Knut Sveidqvist b62d0d974f
Merge pull request #2312 from cm-wada-yusuke/bug/2160-fixed-height-useMaxWith
configureSvgSize should make height 100% when useMaxWidth is true.
2021-09-23 19:32:43 +02:00
Ashish Jain 165a10ac37 Fix for broken classDiagram-v2.spec.js test case 2021-09-23 18:36:45 +02:00
Knut Sveidqvist 004e7e376d
Merge branch 'develop' into feature/2249_sequence_diagram_popup_menus 2021-09-18 10:19:07 +02:00
Knut Sveidqvist 9c511559ff #2315 Adding to docs and an integration test 2021-09-18 07:51:15 +02:00
Yusuke Wada 0839fadbc2 fix e2e 2021-09-15 12:47:24 +09:00
Knut Sveidqvist 8bd830c991
Merge branch 'develop' into feature/field-classifier 2021-09-13 21:45:47 +02:00
eajenkins 85d33ecccd Added support for a new link syntax per recommendation:
link <actor>: <label> @ <link-url>

Removed documentation for class/icon definitions until we can finalize the design for this.

Fixed prettier errors.
2021-09-10 16:27:07 -07:00
Knut Sveidqvist b6ba4b2fd8
Merge pull request #2237 from RonaldZielaznicki/2070_more_columns_for_entity_relationship_diagrams
2070: Update ER Diagram to have keys and comments.
2021-09-09 17:50:38 +02:00
E Jenkins ce6d8576ae
Merge branch 'develop' into feature/2249_sequence_diagram_popup_menus 2021-08-27 15:02:11 -07:00
eajenkins 291bec7e90 Initial implementation for Issue#2249.
Includes changes to sequence diagram code to enable popup menus and individualized styling of actors
Includes unit and e2e tests.
Includes updates to the md file for sequencediagrams.
2021-08-27 10:56:56 -07:00
Ashish Jain f07a777194
Merge pull request #2271 from mermaid-js/2270_direction_class
2270 Adding support for direction statements in class diagrams.
2021-08-26 18:30:12 +02:00
Knut Sveidqvist 0658a363cb #2270 Add support for direction statements for classDiagrams 2021-08-26 17:05:10 +02:00
Xavier Stouder 46a7039ae9 test: e2e test 2021-08-26 11:36:21 +02:00
Ashish Jain 0fba1c06b4 Updated test cases for class diagram v2 2021-08-20 17:28:57 +02:00
Ashish Jain 69a9829041 Updated test cases for class diagram v2 2021-08-20 17:12:46 +02:00
Ashish Jain 2434a94aae Updated test cases for class diagram v2 2021-08-19 21:27:11 +02:00
MOREL Matthieu 55faa3cb1a yarn build and adapt e2e tests
Co-Authored-By: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-18 16:49:00 +02:00
RonaldZielaznicki 3383da514a Update ER Diagram to have keys and comments.
Update ER Diagrams to have keys and comments.
2021-08-12 16:18:54 -04:00
Knut Sveidqvist ed0947d761 Updated test 2021-06-27 00:57:28 +02:00
Knut Sveidqvist 6564bad85e Updated test 2021-06-27 00:40:14 +02:00
Knut Sveidqvist 4c92592aa1 #2050 Updating tests and adding docs 2021-05-18 22:34:24 +02:00
Knut Sveidqvist 09569301f1 #2050 Adding possibility to render subgrapgs in different directions 2021-05-18 21:15:06 +02:00
Knut Sveidqvist d1180a5c69 Fix for broken rendering test 2021-05-16 10:59:07 +02:00
Knut Sveidqvist 84941607df Fix for links between composie states 2021-05-16 10:44:34 +02:00
Knut Sveidqvist 560951d597 Updated test 2021-05-09 15:57:44 +02:00
Knut Sveidqvist d3d0df59cb 2021-05-09 15:34:02 +02:00
Knut Sveidqvist e3164d8d44 #2055 Fix for how ids are set to notes 2021-05-09 11:12:22 +02:00
Knut Sveidqvist aa39dcc34f #2035 Growing composite state width with title 2021-05-02 08:44:28 +02:00
Knut Sveidqvist 6dc71122b8 #2032 Adding new statement to add choice shape in state diagrams 2021-05-01 18:09:42 +02:00
Knut Sveidqvist fab98633a4 Updated test 2021-04-30 10:46:48 +02:00
Knut Sveidqvist 11f3cbdb36 #1958 Handling multiple edges from and to the same node tuple 2021-04-30 10:34:50 +02:00
Knut Sveidqvist de8bdb96bd Final tweaks 2021-04-30 09:04:09 +02:00
Knut Sveidqvist a9f14d9ffe Adding image test for failing testcase 2021-04-29 19:27:04 +02:00
Knut Sveidqvist 45918da48e Updated tests 2021-04-25 12:27:59 +02:00
Knut Sveidqvist cef6273dcf Updated tests 2021-04-25 12:27:51 +02:00
Knut Sveidqvist b69ad0a3d2 Fix for broken test 2021-04-25 10:59:01 +02:00
Knut Sveidqvist f7750e5f04 Style fix for topAxis and added integration test 2021-04-25 10:41:59 +02:00
Knut Sveidqvist 3209986df1 #1955 Fix for tests 2021-03-23 20:10:58 +01:00
Knut Sveidqvist 87458657f8 #1955 Different selector in order to make it possible to change the text color for flowcharts vis classDef statements 2021-03-23 19:22:10 +01:00
Knut Sveidqvist d66727cb35 Render test for requirement diagrams and updated showcase diagrams 2021-02-28 10:28:31 +01:00
Knut Sveidqvist 229f5b0c51 Updated rendering test 2021-02-18 19:52:50 +01:00
Marc Faber 0c724d1a88 fix integration tests 2021-01-23 21:48:36 +01:00
Marc Faber bf8e7a3590 #1783 Apply styles to all types of flowchart node shapes 2021-01-23 20:17:36 +01:00
Knut Sveidqvist ea9a893c24 #1865 Making title color woitk when htmnlLabels are used 2021-01-23 16:07:25 +01:00
Johnny Walker 0fe1fb76d1 test: add tests for sequence diagram text wrap updates 2020-12-12 02:01:40 -05:00
GDFaber f62189b381
Merge pull request #1781 from mermaid-js/bug/1751_flowchart_subgraph_styles
Apply style settings to subgraphs in "flowchart" diagrams
2020-11-18 00:42:30 +01:00
Marc Faber 55532c00b4 Revert updates on integration tests due to failing PR tests 2020-11-18 00:34:02 +01:00
Marc Faber a16bbb8046 #1751 apply style settings to subgraphs in "flowchart" diagrams 2020-11-17 23:18:11 +01:00
Marc Faber 06f74a8c15 updated integration tests 2020-11-17 14:34:48 +01:00
Adrian Hall ae1880311e Support attribute definitions for entities in ERDs 2020-11-02 09:41:46 +00:00
Adrian Hall 851cff4bb8 Merge branch 'develop' into bug/1710_underscore_in_entity_names 2020-10-23 10:02:50 +01:00
Adrian Hall 245e25f4b7 Allow underscores in entity names, and entities with no relationships 2020-10-23 10:00:17 +01:00
Knut Sveidqvist 7c939860d6 #1740 Adding test 2020-10-22 18:47:32 +02:00
Knut Sveidqvist d8da24804f #1724 Adding fontawesome to edge labels 2020-10-15 19:29:37 +02:00
Knut Sveidqvist 4ae61ad35a €1726 updated test 2020-10-15 19:06:38 +02:00
Knut Sveidqvist cc1560d3e3 #1726 fix for link styling and classes for subgraph 2020-10-15 18:42:58 +02:00
Knut Sveidqvist 4b2d98129e #1704 handling of subgraph data 2020-10-07 20:43:31 +02:00
Knut Sveidqvist f0a8eaa5be
Merge pull request #1697 from mermaid-js/1676_click_support_v2
Adds support for custom cssClasses for classDiagram-v2. Also, improved test cases for classDiagram.
2020-09-23 20:41:52 +02:00
Ashish Jain 93bf8d7414 #1696 Fix for custom cssClass test cases for classDiagram 2020-09-23 20:16:06 +02:00
Knut Sveidqvist ce23316008 #1694 Applying styles from the graph definition for flowcharts 2020-09-23 19:51:16 +02:00
Knut Sveidqvist c9ff70b3cc #1657 Handling class definitions for flowchart beta 2020-09-20 12:14:04 +02:00
Ashish Jain 22c710ed99 #1676 Fix for broken test cases 2020-09-16 18:59:53 +02:00
Ashish Jain 28c01f6476 Merge branch 'develop' of https://github.com/knsv/mermaid into 1542_take_two 2020-09-09 18:43:53 +02:00
Knut Sveidqvist 4f8e242dac 2020-09-06 22:34:13 +02:00