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.

Sign up for GitHub

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

Jump to bottom

Support flowchart-elk to use layout: elk #5729

Merged
merged 10 commits into from
Aug 21, 2024
Merged

Support flowchart-elk to use layout: elk #5729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
69b3a9d
feat: Support fallback layouts in renderer
sidharthv96 Aug 21, 2024
754fa24
chore: Remove redundant flowDiagram-v2
sidharthv96 Aug 21, 2024
bc3fe33
feat: Set config.layout=elk when using flowchart-elk
sidharthv96 Aug 21, 2024
77118ad
feat: Use dagre as fallback if elk layout is not present
sidharthv96 Aug 21, 2024
4487569
chore: Remove `mermaid-flowchart-elk`
sidharthv96 Aug 21, 2024
58aa4c4
Merge branch 'develop' into elk-migration
sidharthv96 Aug 21, 2024
43ffb00
[autofix.ci] apply automated fixes
autofix-ci[bot] Aug 21, 2024
50a5351
chore: Use default export
sidharthv96 Aug 21, 2024
db8a002
docs: Add Readme
sidharthv96 Aug 21, 2024
797877b
chore: Use spaces
sidharthv96 Aug 21, 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
2 changes: 1 addition & 1 deletion cypress/platform/flowchart-refactor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@

<script type="module">
import mermaid from './mermaid.esm.mjs';
import { layouts } from './mermaid-layout-elk.esm.mjs';
import layouts from './mermaid-layout-elk.esm.mjs';
mermaid.registerLayoutLoaders(layouts);
mermaid.parseError = function (err, hash) {};

Expand Down
2 changes: 1 addition & 1 deletion cypress/platform/flowchart-sate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@

<script type="module">
import mermaid from './mermaid.esm.mjs';
import { layouts } from './mermaid-layout-elk.esm.mjs';
import layouts from './mermaid-layout-elk.esm.mjs';
mermaid.registerLayoutLoaders(layouts);
mermaid.parseError = function (err, hash) {};

Expand Down
2 changes: 1 addition & 1 deletion cypress/platform/knsv2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@

<script type="module">
import mermaid from './mermaid.esm.mjs';
// import { layouts } from './mermaid-layout-elk.esm.mjs';
// import layouts from './mermaid-layout-elk.esm.mjs';
// mermaid.registerLayoutLoaders(layouts);
mermaid.parseError = function (err, hash) {
console.error('Mermaid error: ', err);
Expand Down
4 changes: 2 additions & 2 deletions cypress/platform/state-refactor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@

<script type="module">
import mermaid from './mermaid.esm.mjs';
import { layouts } from './mermaid-layout-elk.esm.mjs';
import layouts from './mermaid-layout-elk.esm.mjs';
mermaid.registerLayoutLoaders(layouts);
mermaid.parseError = function (err, hash) {

Expand Down Expand Up @@ -1268,4 +1268,4 @@
</script>
</body>

</html>
</html>
4 changes: 2 additions & 2 deletions cypress/platform/viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import mermaid from './mermaid.esm.mjs';
import { layouts } from './mermaid-layout-elk.esm.mjs';
import externalExample from './mermaid-example-diagram.esm.mjs';
import layouts from './mermaid-layout-elk.esm.mjs';
import zenUml from './mermaid-zenuml.esm.mjs';
import mermaid from './mermaid.esm.mjs';

function b64ToUtf8(str) {
return decodeURIComponent(escape(window.atob(str)));
Expand Down
6 changes: 3 additions & 3 deletions docs/config/setup/interfaces/mermaid.LayoutLoaderDefinition.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#### Defined in

[packages/mermaid/src/rendering-util/render.ts:9](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/rendering-util/render.ts#L9)
[packages/mermaid/src/rendering-util/render.ts:11](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/rendering-util/render.ts#L11)

---

Expand All @@ -26,7 +26,7 @@

#### Defined in

[packages/mermaid/src/rendering-util/render.ts:8](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/rendering-util/render.ts#L8)
[packages/mermaid/src/rendering-util/render.ts:10](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/rendering-util/render.ts#L10)

---

Expand All @@ -36,4 +36,4 @@

#### Defined in

[packages/mermaid/src/rendering-util/render.ts:7](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/rendering-util/render.ts#L7)
[packages/mermaid/src/rendering-util/render.ts:9](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/rendering-util/render.ts#L9)
45 changes: 0 additions & 45 deletions packages/mermaid-flowchart-elk/package.json
View file
Open in desktop

This file was deleted.

75 changes: 0 additions & 75 deletions packages/mermaid-flowchart-elk/src/detector.spec.ts
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions packages/mermaid-flowchart-elk/src/detector.ts
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions packages/mermaid-flowchart-elk/src/diagram-definition.ts
View file
Open in desktop

This file was deleted.

Loading
Loading