GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity
5,715 Commits 182 Branches 159 Tags
Commit Graph

632 Commits

Author SHA1 Message Date
Sidharth Vinod
22999e27f0
Merge branch 'develop' into sidv/docs 
* develop:
  build: run `build:prod` on `yarn prepare`
  Build documentation
  Fix typo
  Fix typo in documentation
  added mermerd to integrations documentation
 2022-09-04 13:12:44 +05:30
Alois Klink
1d84cfe2e2
build: run build:prod on yarn prepare 
Adds `yarn build:prod` to the `yarn prepare` script.

For most package managers (e.g. yarn v1 and NPM),
the `prepare` script is called automatically when installing
from a local location/git url. It's not called when installing
from NPM.

This is required because the source code doesn't contain
the `dist/mermaid.min.js` file, it has to be built first.

Fixes installing mermaid via `git`, e.g.:
`yarn add git+https://github.com/mermaid-js/mermaid.git`

Fixes: 1549eb20dfbf0698749ab50b2cb264e63d2015b5
 2022-09-03 23:01:53 +01:00
Sidharth Vinod
5674f8e675
Prettier Pass 2022-09-03 13:41:25 +05:30
Sidharth Vinod
f6d69b33b3
Prettier 2022-09-03 13:30:16 +05:30
Sidharth Vinod
6167eda6b6
Prettier 2022-09-03 13:05:47 +05:30
Sidharth Vinod
4225f5e2f5
Turn off jsdoc warnings that were polluting logs 2022-09-03 10:53:25 +05:30
Sidharth Vinod
3833dcd0d8
Add verification for doc change 2022-09-03 10:06:21 +05:30
Sidharth Vinod
3b88150e11
Move docs to src 2022-09-03 09:06:42 +05:30
Sidharth Vinod
cfae2b6a40
Doc transformer 2022-09-03 02:13:21 +05:30
Sidharth Vinod
99923fcd0f
Test - esbuild 2022-09-02 11:08:14 +05:30
Sidharth Vinod
f1fa91a51c
fix flowchart jison 2022-09-02 00:46:02 +05:30
Sidharth Vinod
53fe35e37e
Add webpack build 2022-09-02 00:36:01 +05:30
Sidharth Vinod
6be05e9948
Esbuild with types 2022-09-02 00:34:03 +05:30
Sidharth Vinod
904eccc4fa
Vite 2022-09-01 23:38:13 +05:30
Sidharth Vinod
01562528b7
Typescript 2022-09-01 22:45:10 +05:30
Sidharth Vinod
7aeb60f42a
Merge branch 'develop' into sidv/esbuild 
* develop: (50 commits)
  Typo fix
  Fix repo URL
  Revert flowchart change
  Revert flowchart change
  Fix TODO Qs
  chore(deps-dev): bump @commitlint/cli from 17.1.1 to 17.1.2
  chore(deps-dev): bump terser-webpack-plugin from 5.3.5 to 5.3.6
  chore(deps-dev): bump webpack-dev-server from 4.10.0 to 4.10.1
  Fix gitGraph findLane function error
  Update dependabot.yml
  Replacing replaceAll with replace
  Rework 'parseDuration' as a pure duration parsing
  Supports duration in decimal
  Create a more consistent 'parseDuration'
  Remove `@ts-ignore`s.
  Fix svgDraw return types
  ...
 2022-09-01 20:38:21 +05:30
Sidharth Vinod
e46d9c1173
Merge branch 'develop' into sidv/typescript 
* develop:
  chore(deps-dev): bump @commitlint/cli from 17.1.1 to 17.1.2
  chore(deps-dev): bump terser-webpack-plugin from 5.3.5 to 5.3.6
  chore(deps-dev): bump webpack-dev-server from 4.10.0 to 4.10.1
  Fix gitGraph findLane function error
  Replacing replaceAll with replace
  Rework 'parseDuration' as a pure duration parsing
  Supports duration in decimal
  Create a more consistent 'parseDuration'
  Fix svgDraw return types
  Add more tests
  Fix nested types
  Fix nested types
  Add nested test
  Updating to version to 9.1.6
 2022-09-01 20:06:42 +05:30
Sidharth Vinod
2272eb6644
Fix repo URL 2022-09-01 20:04:06 +05:30
Knut Sveidqvist
f4a99fc612
Merge pull request #3390 from mermaid-js/dependabot/npm_and_yarn/develop/commitlint/cli-17.1.2 
chore(deps-dev): bump @commitlint/cli from 17.1.1 to 17.1.2
 2022-09-01 16:01:53 +02:00
Knut Sveidqvist
b00d569215
Merge pull request #3389 from mermaid-js/dependabot/npm_and_yarn/develop/terser-webpack-plugin-5.3.6 
chore(deps-dev): bump terser-webpack-plugin from 5.3.5 to 5.3.6
 2022-09-01 16:01:41 +02:00
Knut Sveidqvist
1921623bdf
Merge pull request #3387 from mermaid-js/dependabot/npm_and_yarn/develop/webpack-dev-server-4.10.1 
chore(deps-dev): bump webpack-dev-server from 4.10.0 to 4.10.1
 2022-09-01 16:01:30 +02:00
Knut Sveidqvist
68f8010ab9 Merge branch 'develop' into minmaps 2022-09-01 13:42:21 +02:00
dependabot[bot]
0092ca1da0
chore(deps-dev): bump @commitlint/cli from 17.1.1 to 17.1.2 
Bumps [@commitlint/cli](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/cli) from 17.1.1 to 17.1.2.
- [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.2/@commitlint/cli)

---
updated-dependencies:
- dependency-name: "@commitlint/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-01 08:22:51 +00:00
dependabot[bot]
fa85e2a650
chore(deps-dev): bump terser-webpack-plugin from 5.3.5 to 5.3.6 
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 5.3.5 to 5.3.6.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v5.3.5...v5.3.6)

---
updated-dependencies:
- dependency-name: terser-webpack-plugin
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-01 08:22:31 +00:00
dependabot[bot]
3dc7e0e694
chore(deps-dev): bump webpack-dev-server from 4.10.0 to 4.10.1 
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.10.0 to 4.10.1.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v4.10.0...v4.10.1)

---
updated-dependencies:
- dependency-name: webpack-dev-server
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-01 08:21:49 +00:00
Sidharth Vinod
d67e2723c6
Serve 2022-09-01 13:38:02 +05:30
Sidharth Vinod
965df4fdf4
ESBuild 2022-08-31 23:59:32 +05:30
Sidharth Vinod
4f0e18b088
Esbuild 2022-08-31 23:16:57 +05:30
Sidharth Vinod
9b319a55f6
Merge branch 'develop' into sidv/typescript 
* develop:
  chore(deps-dev): bump @commitlint/cli from 17.0.3 to 17.1.1 (#3376)
  chore(deps-dev): bump eslint from 8.22.0 to 8.23.0 (#3378)
  chore(deps): bump dompurify from 2.3.10 to 2.4.0 (#3375)
  chore(deps-dev): bump @commitlint/config-conventional (#3370)
  chore(deps-dev): bump @babel/core from 7.18.10 to 7.18.13 (#3373)
  chore(deps-dev): bump eslint-plugin-jest from 26.8.7 to 27.0.1 (#3372)
  chore(deps-dev): bump jest-environment-jsdom from 28.1.3 to 29.0.1 (#3369)
  chore(deps-dev): bump babel-jest from 28.1.3 to 29.0.1 (#3368)
  Updating docs to latest mermaid version
  build: add eslint --cache file
  Adjusting size and test
  Updated viewBox settings
  Border
  feat(git): allow custom merge commit ids
  Document line curve options
  Added 'ms' duration
  Fix font weight for messages in sequence diagrams
  Added lollipop feature for updated codebase
 2022-08-31 11:34:59 +05:30
ashishj
e542339ed1 Merge branch 'develop' into 3238_Gitgraph_merge_commits 2022-08-30 17:44:02 +02:00
dependabot[bot]
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
dependabot[bot]
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
dependabot[bot]
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
dependabot[bot]
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
Knut Sveidqvist
4cdc6e4a0d Merge branch 'minmaps' of github.com:mermaid-js/mermaid into minmaps 2022-08-28 14:25:15 +02:00
Knut Sveidqvist
f350ff9852 Merge branch 'minmaps' of github.com:mermaid-js/mermaid into minmaps 2022-08-28 14:25:02 +02:00
Alois Klink
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
Sidharth Vinod
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
Knut Sveidqvist
11809e799b
Merge pull request #3334 from mermaid-js/sidv/fixDoc 
Add `sandbox` to `securityLevel` docs
 2022-08-23 20:10:06 +02:00
Knut Sveidqvist
db961ecefe Fix for build by revering jsdoc 2022-08-23 19:30:15 +02:00
Knut Sveidqvist
576445847c
Revert "chore(deps-dev): bump documentation from 13.2.0 to 14.0.0" 2022-08-23 18:32:20 +02:00
Knut Sveidqvist
9ef3164991
Merge pull request #3342 from mermaid-js/dependabot/npm_and_yarn/develop/prettier-plugin-jsdoc-0.4.1 
chore(deps-dev): bump prettier-plugin-jsdoc from 0.3.38 to 0.4.1
 2022-08-23 17:51:44 +02:00
Sidharth Vinod
1549eb20df
tsConversion: fix DiagramAPI 2022-08-22 13:18:50 +05:30
dependabot[bot]
102542b4e7
chore(deps-dev): bump documentation from 13.2.0 to 14.0.0 
Bumps [documentation](https://github.com/documentationjs/documentation) from 13.2.0 to 14.0.0.
- [Release notes](https://github.com/documentationjs/documentation/releases)
- [Changelog](https://github.com/documentationjs/documentation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/documentationjs/documentation/compare/v13.2.0...v14.0.0)

---
updated-dependencies:
- dependency-name: documentation
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-22 07:03:21 +00:00
dependabot[bot]
8fa57b0b14
chore(deps-dev): bump prettier-plugin-jsdoc from 0.3.38 to 0.4.1 
Bumps [prettier-plugin-jsdoc](https://github.com/hosseinmd/prettier-plugin-jsdoc) from 0.3.38 to 0.4.1.
- [Release notes](https://github.com/hosseinmd/prettier-plugin-jsdoc/releases)
- [Changelog](https://github.com/hosseinmd/prettier-plugin-jsdoc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hosseinmd/prettier-plugin-jsdoc/commits)

---
updated-dependencies:
- dependency-name: prettier-plugin-jsdoc
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-22 07:02:42 +00:00
Sidharth Vinod
d365dacbf7
tsConversion: mermaidAPI 2022-08-22 11:10:30 +05:30
Sidharth Vinod
39aaf2f813
tsConversion: fix paths, add d.ts to output 2022-08-21 22:27:13 +05:30
Sidharth Vinod
a51d8e844b
Merge branch 'develop' into sidv/typescript 
* develop:
  Fix #3009 Update main
  #3243 Adding disabled testcase for diagram with leading \n
 2022-08-21 19:24:15 +05:30
Sidharth Vinod
c68ec54fdd
tsConversion: mermaid main 2022-08-21 18:37:27 +05:30
Sidharth Vinod
bc2b4c57c9
Fix #3009 Update main 2022-08-21 15:06:50 +05:30