GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-21 06:53:17 +08:00
Code Issues Projects Releases Wiki Activity
6,830 Commits 185 Branches 159 Tags
Commit Graph

6830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sidharth Vinod
abc6ee049d
Merge pull request #3873 from mermaid-js/sidv/jsdelivr 
Switch back to jsdelivr
 2022-12-02 13:31:22 +05:30
Knut Sveidqvist
4f1b26fd76 Adding new flowchart renderer using cytoscape 2022-12-02 08:06:16 +01:00
Alois Klink
accba3f408 chore: improve errors for bad YAML frontmatter 
Adds a custom error message for any mermaid diagram that starts with
a `---`. Normally, these are expected to be part of a YAML front-matter
block, but indentation issues or a missing closing `---` may cause
these to be not parsed correctly.
 2022-12-01 22:43:03 +00:00
Ashley Engelund (weedySeaDragon @ github)
bfe3f309d2 remove typeof 2022-12-01 10:09:43 -08:00
Ashley Engelund (weedySeaDragon @ github)
f036d58ec3 Merge remote-tracking branch 'MERMAID/develop' into feat/3626-aria-descBy-roledescription-mocks 
# Conflicts:
#	cypress/integration/rendering/gantt.spec.js
#	cypress/integration/rendering/requirement.spec.js
#	docs/config/setup/modules/mermaidAPI.md
#	packages/mermaid/src/accessibility.js
 2022-12-01 10:08:44 -08:00
Sidharth Vinod
bcbf68b7e1
Merge pull request #3871 from weedySeaDragon/chore/c4-remove-unused-code 
chore: delete functions not used in diagrams/c4 code (dead code)
 2022-12-01 23:07:29 +05:30
Sidharth Vinod
1e30e33ad3
chore: Fix mindmap link 2022-12-01 13:51:50 +05:30
Sidharth Vinod
4b5021c0cc
Merge branch 'develop' into sidv/jsdelivr 
* develop:
 2022-12-01 11:39:52 +05:30
Sidharth Vinod
41033008ec
Merge branch 'master' into develop 
* master:
  doc: Add mindmap integration docs
  fix: Fetch depth
  fix: Fetch depth
  fix: Fetch depth
  fix: Add commit count to release preview
  fix: Add commit count to release preview
  chore: Add working directory
  fix: release-preview-publish.yml
  Fix #3799: Remove `type` from package.json
 2022-12-01 11:39:28 +05:30
Sidharth Vinod
cd0eae2807
chore: Switch back from unpkg to jsdelivr 2022-12-01 11:23:50 +05:30
Sidharth Vinod
8cb6fbfab0
Merge branch 'master' into sidv/jsdelivr 
* master:
  doc: Add mindmap integration docs
  fix: Fetch depth
  fix: Fetch depth
  fix: Fetch depth
  fix: Add commit count to release preview
  fix: Add commit count to release preview
  chore: Add working directory
  fix: release-preview-publish.yml
  Fix #3799: Remove `type` from package.json
 2022-12-01 11:20:16 +05:30
Alois Klink
f884b745dc Merge branch 'develop' into fix/3706_support-indented-yaml-only-in-html 
Conflicts:
 - pnpm-lock.yaml
 2022-11-30 21:11:48 +00:00
Ashley Engelund (weedySeaDragon @ github)
6f2b0c43cb delete functions not used in diagrams/c4 code (dead code) 2022-11-30 12:43:27 -08:00
Knut Sveidqvist
650ee31cd1
Merge pull request #3845 from mermaid-js/sidv/eslintCleanup 
Housekeeping with eslint-unicorn
 2022-11-30 11:53:16 +01:00
Knut Sveidqvist
931d56947a Minor change 2022-11-30 11:27:13 +01:00
Sidharth Vinod
36cf7e0601
Merge pull request #3863 from mermaid-js/sidv/includeMD 
Add support for @include in docs
 2022-11-30 00:51:29 +05:30
Knut Sveidqvist
ff1d56e9b5
Merge pull request #3846 from mermaid-js/sidv/mermaidDocs 
Use current mermaid version in docs.
 2022-11-29 17:13:52 +01:00
Knut Sveidqvist
5e98e99f86
Merge pull request #3829 from DanInProgress/fix/stylis-add-idselector 
Use stylis to prepend idSelector
 2022-11-29 17:10:27 +01:00
Sidharth Vinod
316f612bde
feat: Add @include support to docs 2022-11-29 00:54:01 +05:30
Sidharth Vinod
2a5c2b58de
feat: Add @include example to docs 2022-11-29 00:34:57 +05:30
Sidharth Vinod
e8703a59ec
feat: Add @include support to docs 2022-11-29 00:34:29 +05:30
Sidharth Vinod
3a6dd61f65
cleanup 2022-11-28 16:26:10 +05:30
Sidharth Vinod
bfbb7996e9
fix lines 2022-11-28 16:21:05 +05:30
Sidharth Vinod
1f147b6b63
Merge branch 'develop' into sidv/mermaidDocs 
* develop:
  chore(deps): update pnpm to v7.17.1
  chore(deps): remove dependency on `graphlib`
  test(e2e): make gitgraph snapshots consistent
 2022-11-28 16:13:27 +05:30
Sidharth Vinod
e302ee383a
fix Async rendering 2022-11-28 16:11:24 +05:30
Sidharth Vinod
527a3df083
Revert "sync" 
This reverts commit a88a467d4569837f491e67a97f1a70ca570e087b.
 2022-11-28 15:44:19 +05:30
Sidharth Vinod
b949da9ae4
Merge pull request #3860 from aloisklink/test/make-git-graph-test-consistent 
Make gitgraph snapshots consistent in E2E tests
 2022-11-28 15:42:20 +05:30
renovate[bot]
2984e4fc57 chore(deps): update pnpm to v7.17.1 2022-11-28 07:35:36 +00:00
Ashley Engelund (weedySeaDragon @ github)
2bf753a769 use camelCase 2022-11-27 19:17:37 -08:00
Ashley Engelund (weedySeaDragon @ github)
6044e9e9e8 make test title clearer 2022-11-27 19:17:17 -08:00
Ashley Engelund (weedySeaDragon @ github)
e9d4372c41 Merge remote-tracking branch 'MERMAID/develop' into feat/3626-aria-descBy-roledescription-mocks 2022-11-27 19:10:28 -08:00
Sidharth Vinod
3b91846d0c
Merge pull request #3861 from aloisklink/chore/remove-dependency-on-graphlib 
chore(deps): remove dependency on `graphlib`
 2022-11-28 07:41:50 +05:30
Alois Klink
05b25db5eb chore(deps): remove dependency on graphlib 
`graphlib` has recently been replaced with the ESM version of
graphlib bundled with
[`dagre-d3-es`](https://www.npmjs.com/package/dagre-d3-es), in commit
f687abb1 (chore: Use `graphlib` from `dagre-d3-es`, 2022-11-20)

This means we can safely remove it from our dependencies list.

Fixes: f687abb165795dfe959e87216bb111ebc7bc71cc
 2022-11-27 19:13:53 +00:00
Alois Klink
51119f22df test(e2e): make gitgraph snapshots consistent 
Add a commit id to 'should render a simple gitgraph with a title',
as otherwise the gitgraph renderer picks a random commit ID, and so
image snapshots will be different.
 2022-11-27 18:54:41 +00:00
Ashley Engelund (weedySeaDragon @ github)
2030885fd3 update /docs 2022-11-27 10:46:43 -08:00
Ashley Engelund (weedySeaDragon @ github)
6e486d3c49 add test for multi-line accDescr 2022-11-27 10:32:25 -08:00
Alois Klink
4cc3b17d36 docs(demos): fix indentation of YAML front-matter 
Mermaid diagrams that have YAML front-matter can now be indented in
HTML code, see commit:
5cfa9196 (fix: support parsing indented mmd YAML from HTML, 2022-11-27)

Some diagrams previously had a mix of tabs/spaces for indentation.
In order for `dedent` to work, these diagrams had to be converted to
using a consistent indentation.
 2022-11-27 18:29:28 +00:00
Alois Klink
5cfa919672 fix: support parsing indented mmd YAML from HTML 
In order to parse the YAML front-matter in a Mermaid diagram, the
YAML seperators **MUST NOT** be indented, e.g.:

````markdown
```mermaid
---
title: This is fine.
---
```

```mermaid
  ---
  title: This is not fine, because the `---` are indented.
  ---
```
````

However, this makes it very difficult to write nice Mermaid diagrams in
HTML code-blocks.

This commit uses [`ts-dedent`](https://www.npmjs.com/package/ts-dedent)
to automatically remove the indentation from Mermaid diagrams when
parsed from HTML. Mermaid diagrams from mermaidAPI.render() are **NOT**
dedented, as that API is called from JavaScript code, and therefore
users can easily `dedent` their own diagrams.
 2022-11-27 18:19:13 +00:00
Ashley Engelund (weedySeaDragon @ github)
f1bc2deafd use MockedD3, spies in util insertTitle spec (remove MockD3) 2022-11-27 10:14:11 -08:00
Ashley Engelund (weedySeaDragon @ github)
7508cd796d (minor) fix comment, comment typo 2022-11-27 10:13:32 -08:00
Ashley Engelund (weedySeaDragon @ github)
626a4741c0 Merge remote-tracking branch 'MERMAID/develop' into feat/3626-aria-descBy-roledescription-mocks 2022-11-25 11:30:44 -08:00
Sidharth Vinod
f425a02cf9
Merge branch 'develop' into sidv/mermaidDocs 
* develop:
  chore: Fix lint
  test: Update vitest
  Add official vim plugin to list in integrations
  chore: Add lodash-eslint rule
  chore: Add lodash-eslint rule
  feat: Spellcheck docs when building
  fix: Enable extending lintstagedrc.
  fix: lintstagedrc `lint:jison`
  Fix lodash import
  Formatting
  Update .vite/build.ts
  fix Lint
  Add docs back
  fix: Core build externals
  chore: Update dagre-d3-es
  chore: Use `graphlib` from `dagre-d3-es`
  fix: Add types to memoized functions
  chore: Replace lodash with lodash-es
  Cleanup
 2022-11-25 16:21:05 +05:30
Sidharth Vinod
3e4dc306d4
Merge pull request #3847 from craigmac/patch-1 
Add official vim plugin to list in integrations
 2022-11-25 12:01:32 +05:30
Sidharth Vinod
4a4eff55c1
chore: Fix lint 2022-11-25 12:00:31 +05:30
Sidharth Vinod
5e330a6d78
test: Update vitest 2022-11-24 16:33:42 +05:30
C.D. MacEachern
ecf1273c82
Add official vim plugin to list in integrations 
364438d1e8 added recognition of Mermaid files to Vim. Link here is to the upstream source from which it comes.
 2022-11-23 15:25:06 -05:00
ashishj
14ff8a8570 add runnning example 2022-11-23 19:32:27 +01:00
ashishj
0d5246fbc7 initial commit 2022-11-23 19:28:26 +01:00
Sidharth Vinod
a4fec411bd
Merge branch 'develop' into sidv/eslintCleanup 
* develop:
  chore: Add lodash-eslint rule
  chore: Add lodash-eslint rule
  feat: Spellcheck docs when building
  fix: Enable extending lintstagedrc.
  fix: lintstagedrc `lint:jison`
 2022-11-23 20:52:36 +05:30
Knut Sveidqvist
50aab56177
Merge pull request #3844 from mermaid-js/sidv/fixLintStaged 
fix: LintStaged
 2022-11-23 13:52:40 +01:00