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

5715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sidharth Vinod
9f0137a34d
Update yarn.lock 2022-09-21 10:05:57 +05:30
Sidharth Vinod
7bd7bcf4b8
vite 2022-09-21 09:57:09 +05:30
Sidharth Vinod
36ad4a847e
vite Server 2022-09-21 00:47:04 +05:30
Sidharth Vinod
5791fc9a4d
Cleanup 2022-09-21 00:15:52 +05:30
Sidharth Vinod
d7093c4891
Merge branch 'sidv/vitestEsbuildOnly' into sidv/viteVitest 
* sidv/vitestEsbuildOnly:
  Merge vitest & esbuild
  Merge vitest
  Revert "fix(test): No esm exports"
  fix(test): No esm exports
  unify Jison tranformers
  Fix jest
  fix: imports in HTML
  Revert "Add diagramAPI to outfile"
  Add `type: module` to package.json
  Update mermaid version
  Fix ports
  Fix mjs resolution
  Fix import errors
  fix: conflict
  ESM test
  Add local jison linting
  chore: cleanup
  chore: Remove webpack & babel dependencies
  feat: Remove webpack
 2022-09-21 00:15:11 +05:30
Sidharth Vinod
506e427d56
Merge branch 'develop' into sidv/vite 
* develop:
  Revert #3475
  chore: update browsers list
  Support EMPTYSTR in jison parser, add unit tests for git graph parser
  Use undefined to mean default tagging behavior
  feat(git): allow cherry-pick to suppress tag altogether
  Update src/diagrams/git/parser/gitGraph.jison
  fix(git): fix cherry-pick regex parsing error
  test(git): add basic parsing test for cherry-pick
  feat(git): cherry-pick keyword supports tag attribute
  ci(e2e-applitols): add applitools CI action
  Test docs:verify
  Cleanup docs
  Fixed Linting issues
  #3409 Clean up dead code
  #3409 Fixed the truncated tags issue
 2022-09-21 00:13:14 +05:30
Sidharth Vinod
59f8f5f65e
Merge vitest & esbuild 2022-09-21 00:01:48 +05:30
Sidharth Vinod
3b30232e88
Merge vitest 2022-09-20 23:51:21 +05:30
Sidharth Vinod
e0aae3e31f
Revert "fix(test): No esm exports" 
This reverts commit c21c026749890990482f5f80993a86a3d1c5eef6.
 2022-09-20 23:12:51 +05:30
Sidharth Vinod
c21c026749
fix(test): No esm exports 2022-09-20 23:10:05 +05:30
Sidharth Vinod
b9cb7e9898
fix(docs): mmd detection 2022-09-20 23:01:05 +05:30
Ashley Engelund (weedySeaDragon @ github)
1ea546a0a5 Merge remote-tracking branch 'MERMAID/develop' into develop 
# Conflicts:
#	src/diagrams/git/gitGraphParserV2.spec.js
 2022-09-20 10:25:18 -07:00
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
135f2cc2fd
unify Jison tranformers 2022-09-20 22:46:27 +05:30
Sidharth Vinod
b83f18327a
Fix jest 2022-09-20 22:44:49 +05:30
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
Sidharth Vinod
dab43da202
fix: imports in HTML 2022-09-20 22:13:49 +05:30
Sidharth Vinod
0a944a5de1
Revert "Add diagramAPI to outfile" 
This reverts commit a87abc00c65de91ed417e25c5f81973673f21153.
 2022-09-20 21:54:32 +05:30
Sidharth Vinod
bb824f1147
Merge branch 'sidv/esbuildFail' into sidv/webpackBabelRemoval 
* sidv/esbuildFail:
  Update mermaid version
  Fix ports
  Fix mjs resolution
  Fix import errors
  fix: conflict
 2022-09-20 21:31:42 +05:30
Sidharth Vinod
817a89df70
Merge branch 'develop' into sidv/removeWebpackBabel 
* develop:
  chore: update browsers list
  Support EMPTYSTR in jison parser, add unit tests for git graph parser
  Use undefined to mean default tagging behavior
  feat(git): allow cherry-pick to suppress tag altogether
  Update src/diagrams/git/parser/gitGraph.jison
  fix(git): fix cherry-pick regex parsing error
  test(git): add basic parsing test for cherry-pick
  feat(git): cherry-pick keyword supports tag attribute
  Test docs:verify
  Cleanup docs
  Fixed Linting issues
 2022-09-20 21:15:30 +05:30
Sidharth Vinod
827b3d47b7
Add type: module to package.json 2022-09-20 21:14:56 +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
Alois Klink
48d94568ce fix(git): fix cherry-pick regex parsing error 
I forgot to escape the `-` character in a regex statement.

Fixes: 152795666932cf92af33635d2f98dcbe93e911ba
 2022-09-19 09:53:42 -07:00
Alois Klink
95d92999bb test(git): add basic parsing test for cherry-pick 
Currently, cherry-pick in gitGraphs only has e2e tests,
no parsing unit tests.
 2022-09-19 09:53:42 -07:00
ashishj
51a94e6904 Fixed Linting issues 2022-09-19 09:53:42 -07:00
ashishj
43954b9500 #3409 Fixed the truncated tags issue 2022-09-19 09:53:42 -07:00
weedySeaDragon
636ff1c868 chore: update browsers list 2022-09-19 07:19:25 +00:00
Sidharth Vinod
7bf877d820
fix jison generation 2022-09-19 12:49:24 +05:30
mmorel-35
8e3f9868eb chore: update browsers list 2022-09-19 07:18:46 +00:00
dependabot[bot]
e83c79a169
chore(deps-dev): bump @types/lodash from 4.14.184 to 4.14.185 
Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.14.184 to 4.14.185.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-19 07:05:12 +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
Emerson Bottero
e1f399a06a
Update integrations.md 2022-09-17 12:35:28 -03:00
Emerson Bottero
a481968ec1
Add vitepress pluin 2022-09-16 23:26:25 -03:00