Commit Graph

864 Commits

Author SHA1 Message Date
Jeremy Funk 8c0550b2b7 Code refactoring, add e2e test 2023-03-23 23:45:59 +01:00
Knut Sveidqvist fd9ad95346 #4220 Handling paragraphs and html labels with classes in mindmaps. 2023-03-22 18:41:31 +01:00
Knut Sveidqvist a1c50b8079 #4220 Parsing the text as markdown and rendering accordingly 2023-03-20 14:15:26 +01:00
Remco Haszing 0dc6e0a0d9
Update cypress mermaid imports 2023-03-20 12:21:22 +01:00
Remco Haszing b719fa9b18
Fix Cypress tests 2023-03-17 20:53:13 +01:00
Kazuki Tsunemi 434961b44a Implement rendering logic 2023-03-15 13:26:51 +09:00
Knut Sveidqvist 853d9b7f98 #4220 Create text utility functions handling new lines and applying them on mindmap 2023-03-14 13:52:20 +01: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
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 7cee8cb6dc
Merge branch 'develop' into sidv/fixRunAsync
* develop: (23 commits)
  Fix test
  refactor(deps): replace `moment` with `dayjs`
  test(gantt): test daylight savings in ganttdb
  Update .lycheeignore
  chore: dagre-d3-es@7.0.9
  chore: Add tsdoc for registerLazyLoadedDiagrams
  feat: Ensure proper detection for flowcharts
  fix: Class label not visible if class is already defined
  Update import
  fix TS errors
  fix TS errors
  feat: Match timeline section width to tasks
  chore: TimelineRenderer in TS
  Fix types
  fix: Detector order
  Lint
  Cleanup nodes.js
  docs: Update classdiagram docs
  classLabel tests
  Formatting
  ...
2023-02-28 16:48:54 +05:30
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
Sidharth Vinod 1e5d9ae1f4
fix(#4140): Remove direct usage of mermaidAPI.render 2023-02-24 12:15:55 +05:30
Sidharth Vinod b868777184
docs: v10 breaking changes 2023-02-21 21:35:54 +05:30
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 4ea7294eeb
fix(#3406, #3394): Remove init & initThrowsErrors
New run function added as replacement.
2023-02-19 16:10:08 +05:30
Sidharth Vinod 8363552c3a
Skip flowchart-elk failing test 2023-02-19 14:52:08 +05:30
Sidharth Vinod 735aceb37a
Fix E2E Tests 2023-02-19 14:03:11 +05:30
Sidharth Vinod d22e8d92c6
chore: Remove all non async render/parse/init 2023-02-19 01:10:15 +05:30
Sidharth Vinod bb8bd111f8
Merge branch 'develop' into sidv/classDiagramLabels
* develop: (39 commits)
  Add highlight tag info in contributing.md
  chore(deps): update dependency cypress to v12
  docs: fix links
  Skip precommit hooks on CI
  Fix release-publish
  Fix timeline and mindmap
  Updating integration instructions for timeline and mindmap
  Remove node heap
  Revert "chore: Set node heap size"
  Revert "Remove text hint"
  Split cytoscape
  Linear build
  Remove text hint
  Fix elk import
  Dynamic elk import
  Remove heap option
  elk web-worker
  Test publish docs
  chore: Add file extension for dynamic import
  chore: Defer elk loading
  ...
2023-02-16 18:06:41 +05:30
Sidharth Vinod c815c84e1c
Fix elk import 2023-02-16 15:00:35 +05:30
Knut Sveidqvist eed427b4ac Adding simple direction logic 2023-02-15 14:10:38 +01:00
Knut Sveidqvist 027296df68 Working version before applying direction logic 2023-02-15 13:54:33 +01:00
Sidharth Vinod ef4fbd8bb3
classLabel tests 2023-02-14 00:54:42 +05:30
Sidharth Vinod 102900749e
Add support for classDiagram labels 2023-02-14 00:36:43 +05:30
Knut Sveidqvist 74df4a7a68 Mind map coming in from the cold. A lazy loaded diagram in the same way as timeline. 2023-02-08 17:42:58 +01: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 61f33567ae Making timeline diagram lazy-loaded internal, removing separate package 2023-01-26 10:29:35 +01:00
Olivier Leveau 9fb6f1998f Merge branch 'develop' into feature/AddBoxForSeqDiagrams 2023-01-26 09:14:18 +01:00
ashishj 49ce5222c9 Lint Fixes 2023-01-25 17:49:35 +01:00
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 a28f6bf80c
Merge branch 'develop' into sidv/fixUnhandledPromise
* develop:
  chore: Skip 57-elk test
  Update docs
  Update integrations.md
2023-01-24 16:00:35 +05:30
Sidharth Vinod fb6ba231d0
chore: Skip 57-elk test 2023-01-24 15:59:37 +05:30
Knut Sveidqvist 023f2354cd 2023-01-20 08:31:01 +01:00
ashishj be818ad57f Pushing fix for broken themeVariable functionality 2023-01-19 20:30:11 +01:00
ashishj ca22e85e55 Merge branch 'release/9.4.0' into timeline 2023-01-19 19:20:29 +01:00
ashishj 652a42fe1a Add directive parsing functionality to timeline diagram 2023-01-19 19:03:05 +01:00
Olivier Leveau 250f1f9687 Merge branch 'develop' into feature/AddBoxForSeqDiagrams 2023-01-18 11:35:39 +01:00
Sidharth Vinod afe3f593e1
fix(#4003): Remove unhandled promises
Add eslint rules to check for unhandled promises
Fix all existing unhandled promise issues
2023-01-18 00:47:49 +05:30
Sidharth Vinod 96dedc7b5e
flowchart-elk repro 2023-01-17 21:37:32 +05:30
Sidharth Vinod ae7c9475ef
Merge branch 'sidv/properlyWaitTests' into sidv/internalFCV3
* sidv/properlyWaitTests:
  fix tests
2023-01-16 13:18:31 +05:30
Sidharth Vinod d320e788c7
fix tests 2023-01-16 13:18:16 +05:30
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
Knut Sveidqvist e28a766e7d Cleanup, updating the module name and description for flowchart in package.json 2023-01-11 19:56:04 +01:00
ashishj 68609fd8d0 Merge develop in timeline branch 2023-01-11 18:13:26 +01:00
Knut Sveidqvist 094b97de12 Merge branch 'develop' into layout-v3-continued 2023-01-11 18:03:09 +01:00
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 913ba34386 #815 Adding possibility to configure elk as renderer for flowcharts 2022-12-22 10:33:41 +01:00
Knut Sveidqvist bb9b0b015e #815 Styling subgraphs with color shades 2022-12-16 16:28:24 +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
ashishj fefcc43dd4 Merged Develop in timeline branch 2022-12-15 17:10:56 +01:00
ashishj 2141057ab4 add more runnning examples 2022-12-15 17:00:53 +01:00
Knut Sveidqvist 14f7756fdb #815 Adding labels to edges 2022-12-11 09:24:05 +01:00
Knut Sveidqvist 0b01c3376d #815 Adding labels to subgraphs 2022-12-08 19:41:17 +01:00
Knut Sveidqvist 6c2647e8cf Update url snapshot test for external diagrams 2022-12-08 16:39:21 +01:00
Knut Sveidqvist e1a501c66b Update url snapshot test for external diagrams 2022-12-08 16:38:47 +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
Knut Sveidqvist 9b27396344 Small fix 2022-12-08 13:21:56 +01:00
Ashley Engelund (weedySeaDragon @ github) b1dd0008bc Merge remote-tracking branch 'MERMAID/develop' into feat/3626-aria-descBy-roledescription-mocks 2022-12-07 09:31:20 -08:00
Knut Sveidqvist ebf76e3d1f #815 Using elk for flowchart layouts 2022-12-07 09:37:27 +01:00
Maho Pacheco 4dadf8a72d Adding support for parentheses 2022-12-06 10:38:21 -08:00
Knut Sveidqvist 4124d186d0 Fix for issue #3882 moving the label when the path has been modified 2022-12-03 13:21:10 +01:00
Knut Sveidqvist b68fee7e65 Small fix for issue #3881 2022-12-03 11:41:29 +01:00
Knut Sveidqvist 4863d0d29d Adding new flowchart renderer using elk 2022-12-03 09:47:01 +01:00
Knut Sveidqvist 4f1b26fd76 Adding new flowchart renderer using cytoscape 2022-12-02 08:06:16 +01: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
Sidharth Vinod 15cfa5d40d
Merge branch 'develop' into sidv/splitDiagrams
* develop: (79 commits)
  Minor change
  feat: Add @include support to docs
  feat: Add @include example to docs
  feat: Add @include support to docs
  cleanup
  fix lines
  fix Async rendering
  Revert "sync"
  chore(deps): update pnpm to v7.17.1
  chore(deps): remove dependency on `graphlib`
  test(e2e): make gitgraph snapshots consistent
  chore: Fix lint
  test: Update vitest
  Add official vim plugin to list in integrations
  chore: Cleanup package.json
  chore: Cleanup package.json
  chore: Cleanup package.json
  fix lock
  Docs
  Fix: array concat
  ...
2022-11-30 19:15:21 +05:30
Knut Sveidqvist 650ee31cd1
Merge pull request #3845 from mermaid-js/sidv/eslintCleanup
Housekeeping with eslint-unicorn
2022-11-30 11:53:16 +01:00
Knut Sveidqvist 931d56947a Minor change 2022-11-30 11:27:13 +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
ashishj 14ff8a8570 add runnning example 2022-11-23 19:32:27 +01:00
ashishj 0d5246fbc7 initial commit 2022-11-23 19:28:26 +01: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