7068f6c08a
#3238 Added test cases
2022-08-30 18:32:06 +02:00
5b63260240
Merge pull request #3311 from may4everL/1145_lollipop_interface
...
Added lollipop feature for updated codebase
2022-08-30 18:16:49 +02:00
d2aaf6aad9
#3238 Merge from 'develop'
2022-08-30 18:11:10 +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
e542339ed1
Merge branch 'develop' into 3238_Gitgraph_merge_commits
2022-08-30 17:44:02 +02:00
2229a307a1
#3238 Enhancing the merge commit functionality
2022-08-30 17:42:42 +02:00
49d1a8e248
chore(deps-dev): bump @commitlint/cli from 17.0.3 to 17.1.1 ( #3376 )
...
Bumps [@commitlint/cli](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/cli ) from 17.0.3 to 17.1.1.
- [Release notes](https://github.com/conventional-changelog/commitlint/releases )
- [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/cli/CHANGELOG.md )
- [Commits](https://github.com/conventional-changelog/commitlint/commits/v17.1.1/@commitlint/cli )
---
updated-dependencies:
- dependency-name: "@commitlint/cli"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-29 09:41:54 +02:00
0135ab2ab1
chore(deps-dev): bump eslint from 8.22.0 to 8.23.0 ( #3378 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 8.22.0 to 8.23.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v8.22.0...v8.23.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-29 09:33:32 +02:00
a5d4fdb142
chore(deps): bump dompurify from 2.3.10 to 2.4.0 ( #3375 )
...
Bumps [dompurify](https://github.com/cure53/DOMPurify ) from 2.3.10 to 2.4.0.
- [Release notes](https://github.com/cure53/DOMPurify/releases )
- [Commits](https://github.com/cure53/DOMPurify/compare/2.3.10...2.4.0 )
---
updated-dependencies:
- dependency-name: dompurify
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-29 09:32:33 +02:00
d4a28cc0ec
chore(deps-dev): bump @commitlint/config-conventional ( #3370 )
...
Bumps [@commitlint/config-conventional](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/config-conventional ) from 17.0.3 to 17.1.0.
- [Release notes](https://github.com/conventional-changelog/commitlint/releases )
- [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/config-conventional/CHANGELOG.md )
- [Commits](https://github.com/conventional-changelog/commitlint/commits/v17.1.0/@commitlint/config-conventional )
---
updated-dependencies:
- dependency-name: "@commitlint/config-conventional"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-29 09:32:07 +02:00
97c998c64b
chore(deps-dev): bump @babel/core from 7.18.10 to 7.18.13 ( #3373 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.18.10 to 7.18.13.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.18.13/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-29 09:31:48 +02:00
e7df5d52ba
chore(deps-dev): bump eslint-plugin-jest from 26.8.7 to 27.0.1 ( #3372 )
...
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest ) from 26.8.7 to 27.0.1.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases )
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v26.8.7...v27.0.1 )
---
updated-dependencies:
- dependency-name: eslint-plugin-jest
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-29 09:14:10 +02:00
32b697f674
chore(deps-dev): bump jest-environment-jsdom from 28.1.3 to 29.0.1 ( #3369 )
...
Bumps [jest-environment-jsdom](https://github.com/facebook/jest/tree/HEAD/packages/jest-environment-jsdom ) from 28.1.3 to 29.0.1.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v29.0.1/packages/jest-environment-jsdom )
---
updated-dependencies:
- dependency-name: jest-environment-jsdom
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-29 09:13:01 +02:00
7e28fc087d
chore(deps-dev): bump babel-jest from 28.1.3 to 29.0.1 ( #3368 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 28.1.3 to 29.0.1.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v29.0.1/packages/babel-jest )
---
updated-dependencies:
- dependency-name: babel-jest
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-29 09:07:05 +02:00
4cdc6e4a0d
Merge branch 'minmaps' of github.com:mermaid-js/mermaid into minmaps
2022-08-28 14:25:15 +02:00
f350ff9852
Merge branch 'minmaps' of github.com:mermaid-js/mermaid into minmaps
2022-08-28 14:25:02 +02:00
6ab0eef6f3
Merge branch 'develop'
...
Conflicts:
cypress/platform/knsv.html
2022-08-28 14:22:56 +02:00
17ccd1fd0b
Merge pull request #3366 from mermaid-js/2824_cut_edges
...
2824 Updated sizing of diagrams and cypress tests
2022-08-28 11:51:32 +02:00
4e3d3a7288
Merge pull request #3365 from aloisklink/other/cache-eslint-runs
...
build: add eslint --cache file to speed up commits
2022-08-28 11:48:09 +02:00
018844e8ea
Updating docs to latest mermaid version
2022-08-28 11:46:01 +02:00
850135a936
Merge pull request #3359 from amyq/patch-1
...
Document line curve options
2022-08-28 11:44:44 +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
9e4ae66346
Merge pull request #3364 from mermaid-js/2824_cut_edges
...
2824 cut edges
2022-08-28 08:36:43 +02:00
b7f9495a14
build: add eslint --cache file
...
Currently, doing a `git commit` is a bit low, as eslint runs before
the commit.
Adding an `eslint --cache` makes it slightly faster.
On my PC, `git commit` currently is `Done in 12.24s.`
However, after adding this cache file, it is `Done in 7.54s.`,
so about 1.6x faster.
2022-08-27 17:32:48 +01:00
3b93c39249
Adjusting size and test
2022-08-27 15:11:43 +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
0779c39654
Border
2022-08-27 12:32:33 +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
ba4f7d2ceb
Rework 'parseDuration' as a pure duration parsing
2022-08-25 23:15:28 +02:00
3315ae8382
Supports duration in decimal
2022-08-25 23:15:28 +02:00
f7b8d1ac07
Create a more consistent 'parseDuration'
...
- Remove 'durationToDate' which was not a usable function
2022-08-25 23:15:28 +02:00
86b3a4f09e
Document line curve options
...
An extremely basic MVC explaining that it is possible to adjust how lines in a flowchart are curved, while listing (some of?) the available options.
I doubt I've captured all of the curve options, but capturing the existence of curve options is a start.
Sources:
- https://github.com/mermaid-js/mermaid/issues/580#issuecomment-373929046 where a user references adding the feature to Mermaid
- Which references https://github.com/d3/d3-shape/blob/master/README.md#curves and I think is worth including here
2022-08-25 12:01:55 -07:00
a3dfc4c0e8
Remove `@ts-ignore`s.
...
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
2022-08-25 21:53:36 +05:30
15b160c553
Fix svgDraw return types
...
Co-authored-by: FlorianWoelki <FlorianWoelki@gmx.de>
2022-08-25 12:41:32 +05:30
39980322bd
Add more tests
2022-08-25 11:59:01 +05:30
2f7930efb7
Fix nested types
...
Co-authored-by: FlorianWoelki <FlorianWoelki@gmx.de>
2022-08-25 11:58:43 +05:30
5996e1e69d
Fix nested types
...
Co-authored-by: FlorianWoelki <FlorianWoelki@gmx.de>
2022-08-25 08:49:20 +05:30
cde3a7cf70
Merge pull request #3355 from vallsv/feature-ms-duration
2022-08-24 16:07:45 -07:00
49eebc1c20
Merge pull request #3353 from FabAlchemy/develop
2022-08-24 16:06:38 -07:00
0583c4fa25
Added 'ms' duration
2022-08-24 22:26:39 +02:00
a3ace00ed4
Fix font weight for messages in sequence diagrams
2022-08-24 17:07:56 +02:00
c37ff47ee3
Add nested test
2022-08-24 12:33:32 +05:30
84148d4891
Remove failing test
2022-08-24 12:32:15 +05:30
60651fdfe0
Merge branch 'develop' into sidv/typescript
...
* develop: (22 commits)
Fix for build by revering jsdoc
Revert "chore(deps-dev): bump documentation from 13.2.0 to 14.0.0"
Review comments.
Add test for handling parameter names that are "default"
Add test for handling parameter names that are keywords
Add test for handling trailing whitespaces
Add first C4 parser test
chore(deps-dev): bump eslint-plugin-jest from 26.8.2 to 26.8.7
chore(deps-dev): bump documentation from 13.2.0 to 14.0.0
chore(deps-dev): bump terser-webpack-plugin from 5.3.4 to 5.3.5
chore(deps-dev): bump prettier-plugin-jsdoc from 0.3.38 to 0.4.1
test(e2e): add array and generic attributes erDiagram test
test(common): add generic parser test
test(parser): add tests for generics and arrays in erDiagram
feat: add array and generic symbols for erDiagram
Lint markdown
Fix prettier formatting in vscode
Prettier
Fix `securityLevel` docs
Update README.md
...
2022-08-24 11:38:23 +05:30
1efd5c7d58
Cleanup
2022-08-24 11:32:27 +05:30
fd70b862ed
Merge pull request #3332 from lorint/docs/grammatical_touch_ups
...
Grammatical touch-ups to documentation
2022-08-23 20:18:03 +02:00
1c8035e029
Merge pull request #3333 from abergquist/patch-1
...
Update README.md
2022-08-23 20:10:38 +02:00
11809e799b
Merge pull request #3334 from mermaid-js/sidv/fixDoc
...
Add `sandbox` to `securityLevel` docs
2022-08-23 20:10:06 +02:00
ashishj