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
Sidharth Vinod
48a49b1b4d
Merge pull request #4588 from ibrahimWassouf/enhancement/4158_Add_primary_key_beginning_with_asterisk
...
Allow entity diagram attribute names to start with asterisk
2023-07-17 09:26:46 +00:00
Sidharth Vinod
5e6d42cb5b
Merge pull request #4641 from aloisklink/chore/remove-unused-coveralls-devDependency
...
chore: remove unused `devDependency` on coveralls
2023-07-17 09:20:02 +00:00
Sidharth Vinod
417c69d7e2
Merge pull request #4646 from guilhermgonzaga/docs/fix_checkbox_format
...
docs: Fix checkbox syntax
2023-07-17 09:07:08 +00:00
Guilherme Gonzaga
855f6ef9bf
docs: Fix checkbox syntax
2023-07-16 23:16:37 +00:00
Alois Klink
a0a25ed756
chore: remove unused devDependency on coveralls
...
This `devDependency` hasn't been used for a long time.
2023-07-16 00:21:43 +01:00
Alois Klink
af9b3f77cb
build(docs): allow using custom editLink
...
In Vitepress, allow using a custom `editLink`, if specified in the YAML
frontmatter.
2023-07-15 23:43:24 +01:00
Alois Klink
57ee181fad
build(docs): add editLink: to MD frontmatter
...
Add a YAML front-matter entry called `editLink` to Markdown files in
Vitepress, e.g.
```markdown
---
editLink: "https://github.com/mermaid-js/mermaid/edit/develop/packages/mermaid/src/schemas/config.schema.yaml "
---
Here is my markdown file!
```
Although Vitepress doesn't officially support adding a URL as a
`editLink:` YAML front-matter, we can add a custom `editLink` function
to our Vitepress config that does allow it.
2023-07-15 23:43:24 +01:00
Yokozuna59
39ccad8e5e
Merge branch 'develop' into develop
2023-07-15 15:44:19 +02:00
Lei Nelissen
7e39c13836
chore: narrow down tstype
2023-07-15 15:38:21 +02:00
Lei Nelissen
85515bcf8d
chore: leave the newLine out of the jison spec
2023-07-15 15:28:48 +02:00
Sibin Thomas
383bbefa9e
Added code for Vertical branches for GitGraph and Added TB option in the parser file.
2023-07-15 18:27:42 +05:30
Ibrahim Wassouf
9b9671b57c
Merge branch 'develop' into enhancement/4158_Add_primary_key_beginning_with_asterisk
2023-07-15 08:50:01 -04:00
Ibrahim Wassouf
d6c88ab589
Merge branch 'develop' into bug/4592_fix_newLine_padding_class_diagram
2023-07-15 08:49:38 -04:00
Sidharth Vinod
840609af63
Merge pull request #4577 from kislerdm/bug/4576-c4-support-for-ContainerQueue_Ext
...
Fixes support of the macro `ContainerQueue_Ext` for C4 diagrams definition.
2023-07-15 07:35:05 +00:00
Lei Nelissen
eff9f7e5db
chore: re-generate config
2023-07-15 00:24:02 +02:00
Lei Nelissen
803cd826ed
chore: replace switch-case with map
2023-07-15 00:17:10 +02:00
Lei Nelissen
90c68f5069
chore: add tsType for weekday config
2023-07-15 00:17:09 +02:00
Lei Nelissen
103321bf72
chore: return after scanning weekday in jison
2023-07-15 00:17:09 +02:00
Lei Nelissen
d0afc3bffe
feat: validate individual values of weekdays
2023-07-14 14:13:18 +02:00
Lei Nelissen
11f2e31ff1
fix: also set weekday value to sunday in clear
2023-07-14 14:13:18 +02:00
Lei Nelissen
d9c15b1e7a
chore: move spec test to it.each
2023-07-14 14:13:18 +02:00
