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,505 Commits 182 Branches 159 Tags
Commit Graph

5505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sidharth Vinod
b9cb7e9898
fix(docs): mmd detection 2022-09-20 23:01:05 +05:30
Sidharth Vinod
ffdf268ba2
Merge branch 'develop' into sidv/testDocLint 
* develop:
  ci(e2e-applitols): add applitools CI action
 2022-09-20 22:52:02 +05:30
Sidharth Vinod
f34008b71a
Merge branch 'develop' into sidv/testDocLint 
* develop:
  Revert #3475
 2022-09-20 22:51:12 +05:30
Sidharth Vinod
8f009ed815
Hope this fails 2022-09-20 22:50:39 +05:30
Knut Sveidqvist
71d252f706
Merge pull request #3483 from aloisklink/ci/add-applitools-action 
ci(e2e-applitols): add applitools CI action
 2022-09-20 19:19:34 +02:00
Sidharth Vinod
d5fc319d4e
Remove docs:build from postbuild. 2022-09-20 22:42:05 +05:30
Sidharth Vinod
c343e4a1e3
Add verification log 2022-09-20 22:31:53 +05:30
Sidharth Vinod
b72dad9c5b
Revert #3475 
Was an accidental merge.
 2022-09-20 22:23:59 +05:30
Sidharth Vinod
2ada935842
This should fail CI 2022-09-20 22:20:18 +05:30
Knut Sveidqvist
00c1732b9b
Merge pull request #3475 from sidharthv96/sidv/testDocs 
WIP: Fix docs:verify in CI
 2022-09-20 17:42:36 +02:00
Ashish Jain
a266a9c539
Merge pull request #3479 from elliot-nelson/enelson/git-cherry-pick-tag 
feat(git): cherry-pick keyword supports tag attribute
 2022-09-20 17:38:01 +02:00
mmorel-35
8e3f9868eb chore: update browsers list 2022-09-19 07:18:46 +00:00
Knut Sveidqvist
a6b83c9742
Merge pull request #3480 from aloisklink/fix/broken-cherry-pick-parsing 
Fix broken cherry-pick parsing in gitgraph
 2022-09-19 08:31:55 +02:00
Knut Sveidqvist
7635db4c1e
Merge pull request #3454 from mermaid-js/3409_Truncated_Tags 
3409 Fix for truncated tags in GitGraph
 2022-09-19 08:28:41 +02:00
Elliot Nelson
183fc35fea Support EMPTYSTR in jison parser, add unit tests for git graph parser 2022-09-19 00:04:23 -04:00
Elliot Nelson
9cbacb0159 Use undefined to mean default tagging behavior 2022-09-18 16:25:10 -04:00
Elliot Nelson
f37ac53118 Merge remote-tracking branch 'aloisklink/fix/broken-cherry-pick-parsing' into enelson/git-cherry-pick-tag 2022-09-18 16:21:53 -04:00
Elliot Nelson
4e4b5ccf8d feat(git): allow cherry-pick to suppress tag altogether 2022-09-18 09:22:35 -04:00
Elliot Nelson
4f96116c43
Update src/diagrams/git/parser/gitGraph.jison 
Co-authored-by: Alois Klink <alois@aloisklink.com>
 2022-09-18 08:59:47 -04:00
Alois Klink
aba458b832 fix(git): fix cherry-pick regex parsing error 
I forgot to escape the `-` character in a regex statement.

Fixes: 152795666932cf92af33635d2f98dcbe93e911ba
 2022-09-18 07:00:55 +01:00
Alois Klink
c39a6f27d4 test(git): add basic parsing test for cherry-pick 
Currently, cherry-pick in gitGraphs only has e2e tests,
no parsing unit tests.
 2022-09-18 06:59:44 +01:00
Elliot Nelson
ae920eaa93 feat(git): cherry-pick keyword supports tag attribute 2022-09-17 23:57:32 -04:00
Alois Klink
5c8fda3891 ci(e2e-applitols): add applitools CI action 
Adds a [`workflow_dispatch`][1] GitHub Actions CI workflow
that performs an E2E Cypress rendering test with Applitools
integration.

If the APPLITOOLS_API_KEY secret is not set, this action fallsback to
just doing a normal E2E Cypress test without Applitools support.

[1]: https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
 2022-09-17 22:34:29 +01:00
Alois Klink
e8eb2ab03f
Merge pull request #3459 from aloisklink/chore/update-cypress 
Update Cypress to v10 and fix E2E errors
 2022-09-16 17:32:10 +01:00
Sidharth Vinod
48fb5b3f28
Test docs:verify 2022-09-16 19:55:30 +05:30
Sidharth Vinod
27e40248ff
Cleanup docs 2022-09-16 19:39:38 +05:30
Knut Sveidqvist
37eb0454fd
Merge pull request #3386 from mermaid-js/sidv/esbuild 
ESBuild
 2022-09-16 15:01:39 +02:00
Sidharth Vinod
bb413d555e
cleanup 2022-09-16 18:22:46 +05:30
Sidharth Vinod
2579bf1ad9
Merge branch 'develop' into sidv/esbuild 
* develop:
  Fix docs
 2022-09-16 18:16:45 +05:30
Sidharth Vinod
0605bce887
Fix docs 2022-09-16 18:12:52 +05:30
Sidharth Vinod
6452ccc220
Merge branch 'develop' into sidv/esbuild 
* develop:
  Fix for issues in errorhandling and class diagrams after refactoring
 2022-09-16 18:09:39 +05:30
Sidharth Vinod
2693c9b024
Fix coverage 2022-09-16 18:09:24 +05:30
Knut Sveidqvist
38d9795191
Merge pull request #3470 from mermaid-js/fix_for_error_handling 
Fix for issues in errorhandling and class diagrams after refactoring
 2022-09-16 14:13:07 +02:00
Knut Sveidqvist
9c88c785cb Fix for issues in errorhandling and class diagrams after refactoring 2022-09-16 14:05:15 +02:00
Sidharth Vinod
2f41013740
Merge branch 'develop' into sidv/esbuild 
* develop:
  Replace GoogleAnalytics with Plausible
  fix(git): support single character branch names
  Cleanup unused variables and some commented out code
  Release 9.1.7
  Fix for broken rendering test
  Fix for issue #3428, load the configured diagrams even when initialize has not been called.
  #3395 Renabling the error graph which is rendered on error
  #3395 Fix for lopp stopping at first failure
 2022-09-16 17:30:07 +05:30
Knut Sveidqvist
2d9f25b163
Merge pull request #3469 from mermaid-js/sidv/mergeRelease 
Merge release 9.1.7
 2022-09-16 11:22:35 +02:00
ashishj
4c5d813e58 Fixed Linting issues 2022-09-16 09:25:22 +02:00
Knut Sveidqvist
10d9b88965
Merge pull request #3466 from mermaid-js/sidv/removeGA 
Replace GoogleAnalytics with Plausible
 2022-09-16 08:54:38 +02:00
Knut Sveidqvist
207235ea83
Merge pull request #3464 from aloisklink/fix/3463-support-single-char-branch-names 
fix(git): support single character branch names
 2022-09-16 08:53:12 +02:00
Knut Sveidqvist
97ab62514c
Merge pull request #3461 from mermaid-js/mindmap_warning 
Cleanup unused variables and some commented out code
 2022-09-16 08:44:01 +02:00
Sidharth Vinod
73d02b2582
Merge branch 'develop' into sidv/esbuild 
* develop: (56 commits)
  chore(deps): bump dompurify from 2.3.10 to 2.4.0 (#3444)
  chore(deps): bump stylis from 4.1.1 to 4.1.2 (#3439)
  chore(deps-dev): bump webpack-dev-server from 4.10.1 to 4.11.0 (#3450)
  Cleanup fixing som lingering issues
  Apply suggestions from code review
  chore(deps-dev): bump eslint-plugin-jest from 27.0.1 to 27.0.4 (#3458)
  chore(deps-dev): bump @typescript-eslint/eslint-plugin (#3457)
  chore(deps-dev): bump concurrently from 7.3.0 to 7.4.0 (#3445)
  chore(deps-dev): bump @babel/preset-env from 7.18.10 to 7.19.0 (#3442)
  chore(deps-dev): bump @typescript-eslint/parser from 5.36.1 to 5.37.0 (#3451)
  chore(deps-dev): bump @babel/core from 7.18.13 to 7.19.0 (#3447)
  chore(deps-dev): bump jest-environment-jsdom from 29.0.2 to 29.0.3 (#3441)
  chore(deps-dev): bump babel-jest from 29.0.2 to 29.0.3 (#3448)
  chore(deps-dev): bump eslint from 8.23.0 to 8.23.1
  chore: fix eslint warnings
  chore: Turn off eslint rules in spec, demos, etc.
  chore(deps-dev): bump typescript from 4.8.2 to 4.8.3 (#3446)
  chore(deps): bump actions/checkout from 2 to 3 (#3449)
  change wording of console log message (use comma)
  Moving out tests from mermaid.spec.js
  ...
 2022-09-15 23:00:24 +05:30
Sidharth Vinod
5c2a45cd4d
Replace GoogleAnalytics with Plausible 2022-09-15 17:48:00 +05:30
dependabot[bot]
064c3134e5
chore(deps): bump dompurify from 2.3.10 to 2.4.0 (#3444) 
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-09-15 07:42:28 +02:00
dependabot[bot]
6340c157e8
chore(deps): bump stylis from 4.1.1 to 4.1.2 (#3439) 
Bumps [stylis](https://github.com/thysultan/stylis.js) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/thysultan/stylis.js/releases)
- [Commits](https://github.com/thysultan/stylis.js/compare/v4.1.1...v4.1.2)

---
updated-dependencies:
- dependency-name: stylis
  dependency-type: direct:production
  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-09-15 07:42:13 +02:00
dependabot[bot]
e9239f83e9
chore(deps-dev): bump webpack-dev-server from 4.10.1 to 4.11.0 (#3450) 
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.10.1 to 4.11.0.
- [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.1...v4.11.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Tested-by: Alois Klink <19716675+aloisklink@users.noreply.github.com>
 2022-09-15 01:55:27 +01:00
Alois Klink
59c69600e8 fix(git): support single character branch names 
In gitGraph, add support branch names that only have a single
character.

The branch regex is checking for a starting character, and an
ending character, so it currently needs at least two characters.

I've wrapped everything except the first character in a `()?` to fix
this.

There are some really complicated regexes that do match what
valid git branches are (see https://stackoverflow.com/a/12093994), but
I'm reluctant to add them in, since it will be a pain to test all
the different edgecases.

Hopefully https://github.com/mermaid-js/mermaid/pull/3432 might be used
in the future to make a better gitgraph parser!
 2022-09-15 01:05:11 +01:00
Knut Sveidqvist
0ec7e006ec Cleanup unused variables and some commented out code 2022-09-14 11:11:51 +02:00
Knut Sveidqvist
9acdc0bc2e Cleanup fixing som lingering issues 2022-09-14 10:58:59 +02:00
Knut Sveidqvist
ac788a7e7d
Merge pull request #3453 from mermaid-js/sidv/cleanup 
Cleanup & fix eslint warnings
 2022-09-14 10:35:16 +02:00
Sidharth Vinod
a7fa40ecda
Remove extension 2022-09-14 11:35:49 +05:30