Ibrahim Wassouf
f48a9c8696
Merge branch 'develop' into bug/4645_graph_node_containing_keyword
2023-07-21 21:12:16 -03:00
Ibrahim Wassouf
eea0ea5e07
Add unit tests for node id strings with keywords
2023-07-21 21:10:37 -03:00
Ibrahim Wassouf
20011c6882
Add unit tests for edge text
2023-07-21 20:44:37 -03:00
Ibrahim Wassouf
0cc8f89115
Add edgeText states
2023-07-21 19:40:04 -03:00
Ibrahim Wassouf
8ff06e88ce
Correct expected error message in unit test
2023-07-21 18:27:20 -03:00
Ibrahim Wassouf
3fa3ed7b18
Remove grammar and unit test that expects HEX token
...
This was never really used and had many things wrong with it.
I believe that if a hex was provided in the diagram specification,
the alphanum grammar would break it up into a BRKT and NUM token
and use the first line with the addVertex() function.
Second, the styleLink grammar provides the exact same functionality
with the linkStyle keyword.
Third, updateLink() expects an array of nums, not a hex digit.
Fourth, no documentation is provided on this grammar statement existing.
Fifth, the unit test does not work in version 10.2.4
2023-07-21 18:15:43 -03:00
Ibrahim Wassouf
0a4e5f5f6b
Slightly alter unit test node idString
2023-07-21 18:15:27 -03:00
Ibrahim Wassouf
0d7cc748b8
Replace alphanum with idString where appropriate
2023-07-21 17:33:33 -03:00
Nikolay Rozhkov
a3c645c3eb
Merge pull request #4639 from mastersibin/feature/4451-vertical-branches-in-gitgraph
...
feat | Vertical branches in Git Diagram
2023-07-21 16:30:06 +00:00
Sibin Thomas
bb7b3491e5
Merge branch 'develop' into feature/4451-vertical-branches-in-gitgraph
2023-07-21 14:00:01 +05:30
Ibrahim Wassouf
69c91ae5ed
Add unit test for edge case with lean_right/left vertices
2023-07-21 00:06:18 -03:00
Ibrahim Wassouf
7adb1bccb3
Replace alphanum with NODE_STRING for most usecases
...
What this allows is for idStrings that are separated by
dashes or underscores to be considered one whole string
rather than a bunch of tokens mixed together.
This is necessary for examples such as a-node-graph[text].
Now, the last part of the idString 'graph' will be read as
part of the NODE_STRING token rather than attempting to add
a GRAPH token to the idString.
2023-07-20 23:49:43 -03:00
Alois Klink
38f2ff0bca
Merge pull request #4652 from mermaid-js/dependabot/npm_and_yarn/word-wrap-1.2.4
...
build(deps-dev): bump word-wrap from 1.2.3 to 1.2.4
2023-07-20 22:05:59 +00:00
dependabot[bot]
cd0da4e060
build(deps-dev): bump word-wrap from 1.2.3 to 1.2.4
...
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap ) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases )
- [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4 )
---
updated-dependencies:
- dependency-name: word-wrap
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-07-20 17:44:05 +00:00
Sibin Thomas
df89b92e2c
ran docs:build for documentation
2023-07-20 21:45:47 +05:30
Ibrahim Wassouf
5b987dee93
Put parser in stable state
2023-07-20 13:05:18 -03:00
Sibin Thomas
114f918417
Merge branch 'develop' into feature/4451-vertical-branches-in-gitgraph
2023-07-20 21:29:56 +05:30
Sibin Thomas
346a7fe8b2
Merge branch 'feature/4451-vertical-branches-in-gitgraph' of https://github.com/mastersibin/mermaid into feature/4451-vertical-branches-in-gitgraph
2023-07-20 21:28:21 +05:30
Sibin Thomas
8ae35c1382
updated documentation for vertical branches
2023-07-20 21:27:34 +05:30
Sidharth Vinod
687a9a08d7
Merge pull request #4612 from mermaid-js/sidv/docsVersion
...
Support MERMAID_RELEASE_VERSION in docs.
2023-07-20 15:30:11 +00:00
Sidharth Vinod
478d350188
Update .github/pull_request_template.md
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2023-07-20 20:48:12 +05:30
Sidharth Vinod
4795204719
Merge branch 'develop' into sidv/docsVersion
...
* develop:
build(docs): handle YAML edgecases in markdown
run pnpm lint:fix
Update cypress/helpers/util.ts
change deprecated `btoa` into `Buffer.from`
allow ts extension imports in cypress ts files
build(docs): allow using custom `editLink`
build(docs): add `editLink: ` to MD frontmatter
build(docs): run remark plugins on MermaidConfig
Fix import file extension
Batch by commit
resolve lint issues for `no-inferrable-types`
fix wrong config paramater in some cypress spec
convert cypress/helpers/util.js into ts
convert file from js into ts
2023-07-20 20:46:53 +05:30
Sibin Thomas
99e88e4d0d
Merge branch 'develop' into feature/4451-vertical-branches-in-gitgraph
2023-07-20 16:03:19 +05:30
Sibin Thomas
a171903088
added tests for overlapping commits
2023-07-20 13:15:05 +05:30
Sidharth Vinod
1b2340ba75
Merge pull request #4640 from aloisklink/docs/fix-edit-url
...
Fix the "Edit this page on GitHub" link in Vitepress documentation for the Mermaid Config pages
2023-07-20 06:59:46 +00:00
Ibrahim Wassouf
3496f275bc
Re-implement markdown as its own text type
2023-07-19 22:56:53 -03:00
Ibrahim Wassouf
b46c28425e
Add text state and tests
2023-07-19 22:49:39 -03:00
Alois Klink
4d2d790cc8
build(docs): handle YAML edgecases in markdown
...
Our current method of adding a entry using `+=` is not safe in YAML,
since it's valid to make a YAML object entirely in JSON,
see https://github.com/mermaid-js/mermaid/pull/4640#discussion_r1265133463
We're already using `js-yaml` elsewhere in this file, so we may as well
use it for parsing/stringifying.
Reported-by: Remco Haszing <remcohaszing@gmail.com>
2023-07-19 23:40:46 +01:00
Sidharth Vinod
477bb4308d
Merge pull request #4552 from Yokozuna59/convert-cypress-util-to-ts
...
convert `cypress/helpers/util.js` to ts
2023-07-19 17:49:42 +00:00
Yokozuna59
8cd8714aaf
run pnpm lint:fix
2023-07-19 23:45:02 +03:00
Sidharth Vinod
e25faeee4c
Update cypress/helpers/util.ts
2023-07-19 22:36:55 +05:30
Sibin Thomas
cba5b5a7e3
ran preetier
2023-07-19 21:55:24 +05:30
Yokozuna59
66e5f8ae18
Merge branch 'develop' into convert-cypress-util-to-ts
2023-07-19 19:09:58 +03:00
Sibin Thomas
52a4f8f077
added tests for vertical branches
2023-07-19 20:22:59 +05:30
Sibin Thomas
d81e4fabd5
positioned tags, tilted commit labels and fixed some bugs
2023-07-19 20:22:29 +05:30
Sibin Thomas
863d1bfd4d
removed BT and added TB
2023-07-19 20:21:15 +05:30
Sibin Thomas
9c2afac319
Merge branch 'mermaid-js:develop' into feature/4451-vertical-branches-in-gitgraph
2023-07-19 20:13:53 +05:30
Sidharth Vinod
568d686d2f
Merge branch 'develop' into sidv/docsVersion
2023-07-18 22:07:42 +05:30
Sidharth Vinod
3fcb071592
Move docs.cli to scripts
2023-07-18 22:06:43 +05:30
Sidharth Vinod
483385b2f6
Update PR template
2023-07-18 21:59:00 +05:30
Sidharth Vinod
fff3acd064
Verify release-version on push to release or master
2023-07-18 21:55:44 +05:30
Sidharth Vinod
e66135b67e
Merge pull request #4496 from moka-care/bug/4439_graph_doesnt_load_when_img_fail_to_load
...
Fix graph not loading when the img loads too fast or fail to load
2023-07-18 07:57:38 +00:00
Yokozuna59
072638ce9d
Merge pull request #4634 from leinelissen/develop
...
feat: allow specifying on which weekday a tickInterval should start
2023-07-18 07:33:08 +00:00
Yokozuna59
d9314a869a
change deprecated btoa into Buffer.from
2023-07-17 15:58:58 +03:00
Yokozuna59
662eb431ab
allow ts extension imports in cypress ts files
2023-07-17 15:53:26 +03:00
Yokozuna59
bed8710dbb
Merge branch 'mermaid-js:develop' into convert-cypress-util-to-ts
2023-07-17 15:31:11 +03:00
Sidharth Vinod
38c0a94067
Merge pull request #4633 from ibrahimWassouf/bug/4592_fix_newLine_padding_class_diagram
...
Bug/4592 fix new line padding class diagram
2023-07-17 09:50:47 +00:00
Sidharth Vinod
d3006f6298
chore: Remove numbers from tests
2023-07-17 15:16:05 +05:30
Sidharth Vinod
24f04bb24d
Merge branch 'develop' into bug/4592_fix_newLine_padding_class_diagram
2023-07-17 15:11:39 +05:30
Sidharth Vinod
b5bcc3b992
Revert "Refactor integration tests"
...
This reverts commit 80add648e6d82eb99508b7ffa2acbf52200905c9.
2023-07-17 15:11:14 +05:30
