Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v11.0.1 #5759

Merged
merged 65 commits into from
Aug 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
1d0e98d
Added the langium module for gitGraph
Jul 21, 2024
6f7c291
Added gitGraphAst as typescript added gitGraphTypes and gitGraphParser
Jul 22, 2024
ebd4da9
Merge branch 'mermaid-js:develop' into feature/4401_creating_langium_…
Austin-Fulbright Jul 24, 2024
5460bc0
fixed checkout branch with no commits
Jul 24, 2024
d2e2017
fixed undefined for type errors
Jul 24, 2024
0b67cff
fixed cherrypicking tests
Jul 24, 2024
1a95d48
added Imperative state
Jul 24, 2024
d0eadeb
added parser
Jul 25, 2024
1af9094
fixed options e2e test
Jul 25, 2024
a386bd0
fixed tags for gitGraph
Jul 27, 2024
887e580
fixed some features and added propper default direction
Jul 27, 2024
3168084
fixed rendering
Jul 27, 2024
9f6a7b7
allows for custom merge type
Austin-Fulbright Jul 27, 2024
275dbe9
fixed all rendering differences
Jul 27, 2024
0d4c3e5
added unit tests for gitGraph parser
Jul 27, 2024
e57fee1
Update packages/mermaid/src/diagrams/git/gitGraphAst.ts
Austin-Fulbright Jul 27, 2024
62757c5
Update packages/mermaid/src/diagrams/git/gitGraphAst.ts
Austin-Fulbright Jul 27, 2024
281064f
Update packages/mermaid/src/diagrams/git/gitGraphAst.ts
Austin-Fulbright Jul 27, 2024
ec2d9c9
Update packages/mermaid/src/diagrams/git/gitGraphParser.ts
Austin-Fulbright Jul 27, 2024
5dfc94e
Update packages/mermaid/src/diagrams/git/gitGraphParser.ts
Austin-Fulbright Jul 27, 2024
871f047
Update packages/parser/src/language/gitGraph/module.ts
Austin-Fulbright Jul 27, 2024
6e5e5f9
Update packages/mermaid/src/diagrams/git/gitGraphAst.ts
Austin-Fulbright Jul 27, 2024
346efdd
Update packages/mermaid/src/diagrams/git/gitGraphAst.ts
Austin-Fulbright Jul 27, 2024
a0207f9
Update packages/mermaid/src/diagrams/git/gitGraphAst.ts
Austin-Fulbright Jul 27, 2024
6c1e5aa
Delete packages/mermaid/src/diagrams/git/parser/gitGraph.jison
Austin-Fulbright Jul 27, 2024
ef25160
Update packages/mermaid/src/diagrams/git/gitGraphAst.ts
Austin-Fulbright Jul 27, 2024
f30085c
Update packages/mermaid/src/diagrams/git/gitGraphAst.ts
Austin-Fulbright Jul 27, 2024
9ed38cc
Merge branch 'mermaid-js:develop' into feature/4401_creating_langium_…
Austin-Fulbright Aug 5, 2024
2a38d46
fixed the rest of the concerns, refactored portions of the gitGraphPa…
Aug 5, 2024
38e048b
fixed hash error loc & line properties
Aug 5, 2024
8fe0ed1
added parser test and combined the two gitGraph tests
Aug 6, 2024
00603e7
fix ts-ignore errors refactored large functions to use helpers
Aug 8, 2024
2218929
fixed types in gitGraphTypes
Aug 8, 2024
a93b832
made draw commit more readable, included more helper functions and in…
Aug 10, 2024
e0d0cdc
Merge branch 'mermaid-js:develop' into feature/4401_creating_langium_…
Austin-Fulbright Aug 10, 2024
62950c3
finished gitGraphRenderer.ts
Aug 10, 2024
269284c
added parser unit tests and organized config in gitGraphAst.ts
Aug 10, 2024
d684e0d
added more unit tests to gitGraphParser.ts and gitGraphRenderer.ts
Aug 10, 2024
c49a1bf
fixed custom type REVERSE for merge, fixed branch spacing for TB
Aug 10, 2024
aba306b
fixed highlight color
Aug 10, 2024
d73a090
fixed BT with parallel commits and added more unit tests
Aug 11, 2024
73aae9e
Merge branch 'develop' into feature/4401_creating_langium_parser_gitG…
Austin-Fulbright Aug 12, 2024
d50150c
Merge branch 'mermaid-js:develop' into feature/4401_creating_langium_…
Austin-Fulbright Aug 13, 2024
3539a35
[autofix.ci] apply automated fixes
autofix-ci[bot] Aug 13, 2024
299e559
added config as global
Aug 14, 2024
53798be
fixed gitgraphconfig problem
Aug 15, 2024
66e53df
added most suggested changes
Aug 20, 2024
b93691b
fixed small error
Aug 20, 2024
4ec0dcf
Merge branch 'develop' into feature/4401_creating_langium_parser_gitG…
Austin-Fulbright Aug 20, 2024
d9d9cc9
added objects to be transfered from parser to db
Aug 20, 2024
7a7b415
implemented transfer objects from parser to db
Aug 20, 2024
94ee076
fixed config for user configs
Aug 20, 2024
3ac2429
fixed merge
Aug 20, 2024
8ef30a2
Merge branch 'develop' into feature/4401_creating_langium_parser_gitG…
Austin-Fulbright Aug 20, 2024
24ba5b7
added gitgraph in imperative state
Aug 20, 2024
52f5d95
Merge branch 'develop' into feature/4401_creating_langium_parser_gitG…
Austin-Fulbright Aug 21, 2024
6c89763
Merge branch 'develop' into feature/4401_creating_langium_parser_gitG…
sidharthv96 Aug 23, 2024
a87f773
Merge branch 'develop' into pr/Austin-Fulbright/5664
sidharthv96 Aug 23, 2024
5deaef4
chore: add changeset
sidharthv96 Aug 23, 2024
a10f469
Merge pull request #5664 from Austin-Fulbright/feature/4401_creating_…
sidharthv96 Aug 23, 2024
ca57235
fix: Type export for layout-elk
sidharthv96 Aug 24, 2024
501a55d
chore: Add changeset
sidharthv96 Aug 24, 2024
1e35341
Merge pull request #5758 from mermaid-js/sidv/fixTypes
sidharthv96 Aug 24, 2024
1bb09cc
Merge branch 'master' into develop
sidharthv96 Aug 24, 2024
17c0af1
chore: Update flowchart widths
sidharthv96 Aug 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/dirty-mails-watch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@mermaid-js/parser': minor
'mermaid': patch
---

chore: Migrate git graph to langium, use typescript for internals
5 changes: 5 additions & 0 deletions .changeset/khaki-news-count.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@mermaid-js/layout-elk': patch
---

fix: Types path
4 changes: 2 additions & 2 deletions cypress/integration/rendering/flowchart-v2.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ describe('Flowchart v2', () => {
const style = svg.attr('style');
expect(style).to.match(/^max-width: [\d.]+px;$/);
const maxWidthValue = parseFloat(style.match(/[\d.]+/g).join(''));
expect(maxWidthValue).to.be.within(446 * 0.95 - 1, 446 * 1.05);
expect(maxWidthValue).to.be.within(417 * 0.95, 417 * 1.05);
});
});
it('8: should render a flowchart when useMaxWidth is false', () => {
Expand All @@ -118,7 +118,7 @@ describe('Flowchart v2', () => {
const width = parseFloat(svg.attr('width'));
// use within because the absolute value can be slightly different depending on the environment ±5%
// expect(height).to.be.within(446 * 0.95, 446 * 1.05);
expect(width).to.be.within(446 * 0.95 - 1, 446 * 1.05);
expect(width).to.be.within(417 * 0.95, 417 * 1.05);
expect(svg).to.not.have.attr('style');
});
});
Expand Down
4 changes: 2 additions & 2 deletions packages/mermaid-layout-elk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"version": "0.1.0",
"description": "ELK layout engine for mermaid",
"module": "dist/mermaid-layout-elk.core.mjs",
"types": "dist/packages/mermaid-layout-elk/src/index.d.ts",
"types": "dist/layout.d.ts",
"type": "module",
"exports": {
".": {
"import": "./dist/mermaid-layout-elk.core.mjs",
"types": "./dist/packages/mermaid-layout-elk/src/index.d.ts"
"types": "./dist/layout.d.ts"
},
"./*": "./*"
},
Expand Down
Loading
Loading