95d8e3a5df
Merge branch 'develop' into feature/class-namespace
2023-04-25 16:40:42 +09:00
642bc1a739
update tests for package visibility
2023-04-17 07:24:27 -07:00
204baa4586
Merge branch 'develop' into feature/class-namespace
2023-04-17 11:27:10 +09:00
aa5c1a5f78
Merge branch 'develop' into fix-node16-module-resolution
2023-04-13 14:58:17 +02:00
9bb0cef82b
fix: wait for image rendering in nodes
2023-04-08 16:28:58 +01:00
917a54f3cd
Merge branch 'develop' into 4220-string-synax-and-features
2023-04-03 12:31:56 +02:00
471c842a58
Adding rendering tests and unit tests
2023-04-03 12:12:51 +02:00
da7725f38e
Merge branch 'develop' into fix-node16-module-resolution
2023-04-01 12:05:19 +02:00
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
057c9e4b81
Merge branch 'develop' into feature/1618_repeating_tasks
2023-03-31 08:42:10 +02:00
7739302ee8
fix uncaughexception in tests
2023-03-30 23:28:41 +05:30
46ab6f46f2
fix( #4256 ): Keep error diagram on screen
2023-03-30 23:09:46 +05:30
ba1c5dc6c7
Change to using display mode yaml
2023-03-25 01:56:50 +01:00
fd9680a050
Fix bug
2023-03-24 00:18:52 +01:00
8c0550b2b7
Code refactoring, add e2e test
2023-03-23 23:45:59 +01:00
434961b44a
Implement rendering logic
2023-03-15 13:26:51 +09:00
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
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
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
8810b378b3
fixup! fixup! Move pie outerStrokeWidth to theme variables, update docs
2023-02-28 13:48:50 -06:00
82f5b4ca39
Move pie outerStrokeWidth to theme variables, update docs
2023-02-28 13:27:09 -06:00
e050a5aaa1
Fix test
2023-02-28 15:40:59 +05:30
3bed70a0c5
fixup! fixup! feat(pie): adding outer border, text position options
2023-02-25 15:47:38 -06:00
b079fb4710
fixup! feat(pie): adding outer border, text position options
2023-02-25 15:43:16 -06:00
6e4e529af2
feat(pie): adding outer border, text position options
2023-02-24 18:56:29 -06:00
b13707fa7b
fix: Class label not visible if class is already defined
2023-02-24 13:46:56 +05:30
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
555d4f2cdc
Fix spellings
2023-02-21 13:27:37 +05:30
ec5fa31a11
Wrap option working in test case
2023-02-21 07:00:51 +01:00
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
b6cac3a431
#3192 Adding docs and visual test
2023-02-20 11:19:23 +01:00
3e480612c7
Merge branch 'release/10.0.0' into sidv/splitDiagrams
...
* release/10.0.0:
Skip elk
2023-02-20 00:36:33 +05:30
4c7306d808
Skip elk
2023-02-20 00:36:13 +05:30
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
5de5598069
Skip all elk tests as it's flaky
2023-02-20 00:30:27 +05:30
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
1691d48b2e
skip failing elk test
2023-02-19 18:26:13 +05:30
8363552c3a
Skip flowchart-elk failing test
2023-02-19 14:52:08 +05:30
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
ef4fbd8bb3
classLabel tests
2023-02-14 00:54:42 +05:30
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
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
8d6d90021a
Update cypress/integration/rendering/sequencediagram.spec.js
2023-02-05 11:54:56 +05:30
df1e9c4117
Added rendering test cases
2023-01-25 17:46:23 +01:00
250f1f9687
Merge branch 'develop' into feature/AddBoxForSeqDiagrams
2023-01-18 11:35:39 +01:00
ded83b2ce7
Fix title
2023-01-16 02:17:25 +05:30
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
4d3f151cf0
feat: Wait for rendering to finish before taking image snapshots
2023-01-16 02:07:37 +05:30
ee056e1ac3
test: Update width
2023-01-12 19:47:39 +05:30
242a508d50
feat: Flowchart-elk integration
2023-01-12 18:26:08 +05:30
e659601e03
Add Box support in Sequence Diagrams
2023-01-05 15:40:40 +01:00
d8aa44f0c5
fix typos accessing techn property in drawC4Shape function
2022-12-24 20:25:59 +01:00
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
6c2647e8cf
Update url snapshot test for external diagrams
2022-12-08 16:39:21 +01:00
e1a501c66b
Update url snapshot test for external diagrams
2022-12-08 16:38:47 +01:00
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
98fc866444
Minor change of test code
2022-12-08 14:16:25 +01:00
c6fce2431b
Fixes for tests
2022-12-08 14:14:31 +01:00
9b27396344
Small fix
2022-12-08 13:21:56 +01:00
4dadf8a72d
Adding support for parentheses
2022-12-06 10:38:21 -08:00
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
650ee31cd1
Merge pull request #3845 from mermaid-js/sidv/eslintCleanup
...
Housekeeping with eslint-unicorn
2022-11-30 11:53:16 +01:00
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
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
626a4741c0
Merge remote-tracking branch 'MERMAID/develop' into feat/3626-aria-descBy-roledescription-mocks
2022-11-25 11:30:44 -08:00
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
7f4368415d
chore: Add eslint-unicorn & fix
2022-11-23 01:05:08 +05:30
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
a11ab3d5ea
Disallow leading whitespace before delimiter
2022-11-19 12:52:49 -08:00
70f024735b
Add title support using YAML frontmatter
2022-11-18 20:42:54 -08:00
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
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
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
0adc6a6112
remove a11y from individual diagrams; now happens in mermaidAPI render
2022-11-17 12:28:11 -08:00
03a11e103e
(minor) fix typo
2022-11-17 12:19:31 -08:00
beab2278d8
feat: Async mermaid docs
2022-11-14 22:06:26 +05:30
a83f88bdf1
chore: Merge master to develop
2022-11-10 13:51:53 +05:30
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
3166f689f9
feat(gantt): Add option 'tickInterval' for custom tick interval
...
See issue #1598
2022-10-27 16:47:42 +08:00
599d035daf
merge MERMAID/develop into branch
2022-10-25 07:42:57 -07:00
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
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
c71b6e31f7
Merge branch 'develop' into feat/3601-cspell-configuration
2022-10-18 21:02:38 +05:30
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
75e11b1fde
add basic render (cypress) test for classDiagram-v2 too
2022-10-17 12:33:23 -04:00
cead1f36f4
add basic render (cypress test for notes
2022-10-17 12:13:22 -04:00
3108e896b6
add renedering (cypress) tests
2022-10-17 12:03:51 -04:00
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
d1f3b889d6
add cypress tests for classDefs and applying classes to states
2022-10-11 08:33:43 -07:00
646f76d343
Fix for broken test
2022-10-07 14:36:25 +02:00
f9753fc621
chore: Update test URL
2022-10-05 16:04:26 +08:00
d3a81f025a
chore(tests): Interaction - cleanup
2022-10-04 16:59:05 +08:00
750f647b0d
fix(tests): Interaction - Security strict, other
2022-10-04 16:55:46 +08:00
2a9e56439e
fix(tests): Interaction test - Security loose.
2022-10-04 16:37:37 +08:00
8c63d002e7
fix: js-base64
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-09-23 16:53:11 +05:30
4e4b5ccf8d
feat(git): allow cherry-pick to suppress tag altogether
2022-09-18 09:22:35 -04:00
ae920eaa93
feat(git): cherry-pick keyword supports tag attribute
2022-09-17 23:57:32 -04:00
595f7680e9
fix(flowchart-v2): fix arrowMarkerAbsolute=true
...
The if-check for arrowMarkerAbsolute in the flowchart-v2 code is in
dagre-wrapper. Unfortunately, I can't seem to find a way to find the
local conf (e.g. the one set via `flowRenderer.setConf()`, so instead
I'm using global mermaid config from `src/config`.
Flowchart v1 arrowMarkerAbsolute=true is still broken, but I'm not
really sure how to fix that.
2022-09-14 04:15:52 +01:00
6e7037bafd
test(e2e): fix most arrowMarkerAbsolute tests
...
The arrows between flowcharts do not have the class edgePath.
Instead, I'm loading all `<path>`s within the `<g class='edgePaths'>`
2022-09-14 04:15:52 +01:00
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
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
f05c790248
test(e2e): fix failing xss9 test
...
Fixes xx9 test to continue running even if JavaScript throws an
exception.
2022-09-14 04:15:52 +01:00
01106caa59
Merged typescript changes
2022-09-05 11:22:17 +02:00
047b7023a2
Updated with cloud and bang shapes
2022-09-05 09:54:00 +02:00
ccb16e5f5a
Adding cloud and bang shapes
2022-09-02 11:08:26 +02:00
68f8010ab9
Merge branch 'develop' into minmaps
2022-09-01 13:42:21 +02:00
63c385a5d7
Adding some rendering tests
2022-08-30 21:36:17 +02:00
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
6ab0eef6f3
Merge branch 'develop'
...
Conflicts:
cypress/platform/knsv.html
2022-08-28 14:22:56 +02:00
080bde0bc2
#2824 Updated regressionstest afters diagram sizing changes
2022-08-28 11:39:22 +02:00
e6e7bdcb55
#2824 Size changes and updated regressionstest afters diagram sizing changes
2022-08-28 11:25:09 +02:00
2968b400c4
Updated viewBox settings
2022-08-27 15:03:29 +02:00
d0d5739ab0
Merge branch 'develop' into minmaps
2022-08-27 12:35:30 +02:00
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
0583c4fa25
Added 'ms' duration
2022-08-24 22:26:39 +02:00
19a9f90186
test(e2e): add array and generic attributes erDiagram test
2022-08-20 15:15:05 +02:00
9b54feab84
Merge branch 'develop' into minmaps
2022-08-06 10:53:54 +02:00
afe343e94f
Changes after merge
2022-08-06 10:49:32 +02:00
0ab152d644
Updated the integration test selectors
2022-08-04 19:40:51 +02:00
e6b410af04
Selector fixes for interaction tests
2022-08-04 19:26:34 +02:00
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
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
9ee43c0b7a
snapshot test for more 8 branches with commits
2022-08-01 19:41:54 +08:00
ffe520db06
Curved edges
2022-07-29 15:06:21 +02:00
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
8681e78e50
Fixes for rendering tests
2022-07-20 14:39:01 +02:00
dee9cfea85
Reverting to cypress 9.7 in order to get applitools back in the game
2022-07-20 11:32:21 +02:00
648b15b00b
Upgrade Cypress
2022-06-19 14:36:54 +02:00
e3df38e078
#3080 Added more rendering test for cherry pick functionality
2022-06-07 20:52:52 +02:00
c147404d1c
#3080 Added support for cherry pick commits
2022-06-07 20:32:43 +02:00
90d187c48a
#3080 Added rendering test cases
2022-06-07 18:52:38 +02:00
bd459fadd3
2022-05-31 20:35:44 +02:00
7372ca5e8e
Adding "Critical Region" and "Break" blocks
2022-05-21 09:31:06 +02:00
85062ac570
#3046 Add support for cyclic themeVariable rotation for more than 8 branches
2022-05-17 19:15:50 +02:00
eadbf595ba
Adding applitools to inegration tests
2022-05-10 20:33:55 +02:00
65143a0182
#2732 Regression fixes for accessibility
2022-05-06 19:42:40 +02:00
bada661bd0
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2022-04-28 18:45:22 +02:00
d914e23626
Fix for hideUnusedParticipants
2022-04-28 18:45:18 +02:00
c58a04bc94
Fix broken configuration spec test
2022-04-28 18:26:50 +02:00
5aac0734d5
Fix for broken Requirement diagram cypress test
2022-04-28 18:26:31 +02:00
386f3c7ce9
Merge branch 'develop' into feature/hideUnusedParticipants_1210
2022-04-28 17:38:48 +02:00
c0bdf9d99b
Merge pull request #2958 from mermaid-js/decode_entities_update
...
Removal of vulnerability
2022-04-21 21:25:08 +02:00
df87ab8818
Fix for vulnerability
2022-04-21 21:11:48 +02:00
4c93870580
feat: add hideUnusedParticipants and some cleanup
2022-04-14 19:19:18 -07:00
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
3d7cb212c0
feat: Add accessibility fields to requirements diagram
2022-04-07 18:02:48 +00:00
65b0b83625
Adds accDescription, draws tags to svg
2022-04-07 10:05:54 -04:00
bbac11a4b8
Updated rendering test with fixed id
2022-03-31 19:49:42 +02:00
f6421734a2
Merge branch 'develop' into 1252_gitgraph_reinvented
2022-03-31 19:16:31 +02:00
fca58aafb1
Test updates when switching to cypress-image-snapshoits
2022-03-31 19:14:37 +02:00
Kazuki Tsunemi