mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,870 Commits 158 Branches 138 Tags 344 MiB
Commit Graph

660 Commits

Author SHA1 Message Date
Knut Sveidqvist 646f76d343 Fix for broken test 2022-10-07 14:36:25 +02:00
Knut Sveidqvist 047e15951a Fix for issue in classdiagram-v2 from the typescript updates 2022-10-07 12:17:35 +02:00
Knut Sveidqvist 802407c8ae Merge remote-tracking branch 'origin/develop' into lazy-load-import 2022-10-07 10:46:16 +02:00
Knut Sveidqvist 439274c5ae chore: Cleanup 2022-10-07 10:40:01 +02:00
Sidharth Vinod acd9a8aefb
Merge branch 'lazy-load-import' into sidv/fixE2E 
* lazy-load-import:
  chore: cleanup
  fix: dynamic import
  fix: Filename in viewer.js
  fix: Import diagram
  Updated logic for diagram loading
  WIP
 2022-10-07 15:02:47 +08:00
Sidharth Vinod 3e3de72093
fix: dynamic import 2022-10-07 14:51:37 +08:00
Sidharth Vinod 9f286b46ff
fix: Filename in viewer.js 2022-10-06 23:39:30 +08:00
Sidharth Vinod d59f878020
fix: use async in render-after-error 2022-10-06 17:49:10 +08:00
Sidharth Vinod c919bef70e
fix: Import diagram 2022-10-06 13:47:00 +08:00
Knut Sveidqvist 0f2e0c2ab4 Updated logic for diagram loading 2022-10-05 22:03:05 +02:00
Knut Sveidqvist c05c98c082 WIP 2022-10-05 13:14:05 +02:00
Sidharth Vinod f9753fc621
chore: Update test URL 2022-10-05 16:04:26 +08:00
Sidharth Vinod 42b59a9e35
Merge remote-tracking branch 'upstream/develop' into sidv/fixE2E 
* upstream/develop: (33 commits)
  Updated lockfile
  chore(deps-dev): update vite requirement from ^3.0.9 to ^3.1.4
  chore(deps-dev): update typescript requirement from ^4.8.3 to ^4.8.4
  chore(deps-dev): update @vitest/coverage-c8 requirement
  chore(deps-dev): update @typescript-eslint/eslint-plugin requirement
  chore(deps-dev): update esbuild requirement from ^0.15.8 to ^0.15.10
  chore(deps-dev): update @commitlint/config-conventional requirement
  chore(deps-dev): update eslint-plugin-jest requirement
  chore(deps-dev): update @applitools/eyes-cypress requirement
  chore(deps-dev): update jsdom requirement from ^20.0.0 to ^20.0.1
  chore(deps-dev): update vitest requirement from ^0.23.1 to ^0.23.4
  chore(deps-dev): update lint-staged requirement from ^13.0.0 to ^13.0.3
  chore(deps): update @types/node requirement from ^18.7.21 to ^18.8.1
  chore(deps-dev): update @typescript-eslint/parser requirement
  Fix postbuild script
  #3561 Adding cScale0-11 etc and usage of the colors from the mindmap diagram
  Fix for broken test
  Mindmap cleanup
  Using cose-bilkent layout algorithm for mindmaps
  chore(deps-dev): update husky requirement from ^8.0.0 to ^8.0.1
  ...
 2022-10-05 14:58:40 +08:00
Sidharth Vinod 74bd576ebc
fix(mermaid): Add await to render in init. 2022-10-05 14:52:04 +08:00
Sidharth Vinod a017ffc3c9
fix(test): Rerender 2022-10-05 14:08:53 +08:00
Sidharth Vinod d3a81f025a
chore(tests): Interaction - cleanup 2022-10-04 16:59:05 +08:00
Sidharth Vinod 750f647b0d
fix(tests): Interaction - Security strict, other 2022-10-04 16:55:46 +08:00
Sidharth Vinod 2a9e56439e
fix(tests): Interaction test - Security loose. 2022-10-04 16:37:37 +08:00
Knut Sveidqvist 8ee321fd7b #3561 Adding cScale0-11 etc and usage of the colors from the mindmap diagram 2022-10-03 14:51:13 +02:00
Knut Sveidqvist 0a2804c641 Mindmap cleanup 2022-10-03 11:08:55 +02:00
Knut Sveidqvist 5079fa93b4 Using cose-bilkent layout algorithm for mindmaps 2022-10-03 10:05:12 +02:00
Knut Sveidqvist 56add0756f Lazy loading fix for example-diagram and mindmaps 2022-10-03 07:01:56 +02:00
Per Brolin 6ebfbb2f9e Arrow tip aligned to edge of box 2022-09-29 20:37:57 +02:00
Knut Sveidqvist f46f8752ca Adding example diagram as a template for a new diagram 2022-09-28 17:49:47 +02:00
Knut Sveidqvist 053a20bd33 Returning the borders to the e2e tests 2022-09-28 15:33:33 +02:00
Knut Sveidqvist f60c7fff65 Merge branch 'develop' into 3061_making_a_monorepo 2022-09-28 14:26:07 +02:00
Knut Sveidqvist fe8df78322 Clarification in the docs regarding directions in the subgraps for flowcharts. 2022-09-28 12:32:58 +02:00
Knut Sveidqvist 982c1b4979 #3061 Lazy loading auto derived path 2022-09-26 14:22:21 +02:00
Knut Sveidqvist a928120bec #3061 Log handing and other fixes, error handling in diagram creation 2022-09-26 10:44:18 +02:00
Knut Sveidqvist 9566f51ca8 Commiton issue #3061 Injecting mermaid utilities in registered diagram 2022-09-26 08:01:23 +02:00
Knut Sveidqvist af2b1945a3 Detector registering itself on load 2022-09-23 16:55:30 +02:00
Sidharth Vinod 913468a7b5
Merge branch 'sidv/viteVitest' into sidv/3061_monorepo 
* sidv/viteVitest:
  fix: Core build
  fix: js-base64
  fix OutputOptions type
  fix: js-base64
  fix: json import, js-base64
  fix: json import
 2022-09-23 17:29:35 +05:30
Sidharth Vinod 8c63d002e7
fix: js-base64 
Co-authored-by: Alois Klink <alois@aloisklink.com>
 2022-09-23 16:53:11 +05:30
Sidharth Vinod bc0be28f08
fix: js-base64 
Co-authored-by: Alois Klink <alois@aloisklink.com>
 2022-09-23 15:54:24 +05:30
Sidharth Vinod eaa1602b1a
fix: json import, js-base64 
Co-authored-by: Alois Klink <alois@aloisklink.com>
 2022-09-23 15:42:41 +05:30
Sidharth Vinod bf25be7cf0
Merge branch 'sidv/viteVitest' into sidv/3061_monorepo 
* sidv/viteVitest:
  ts conversion
  cleanup
  remove esbuild
  fix: tests
  chore: Add recommended extensions
  Fix user-journey leaking css
  Add "Debug Current Test File" configuration for VSCode
  Fix unit test coverage
  Use vite for build
  Fix docs
  vite
  vite Server
  Cleanup
  Merge vitest & esbuild
  Merge vitest
  fix jison generation
  Vite
  Vite
 2022-09-23 11:31:15 +05:30
Sidharth Vinod 9e35bf6e6f
fix: tests 2022-09-23 10:40:56 +05:30
Sidharth Vinod aeb31fe1ae
Use vite for build 2022-09-22 15:35:22 +05:30
Knut Sveidqvist 0e0a6c0f69 Fixed paths for dev server 2022-09-22 11:28:37 +02:00
Sidharth Vinod dab43da202
fix: imports in HTML 2022-09-20 22:13:49 +05:30
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
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 4e4b5ccf8d feat(git): allow cherry-pick to suppress tag altogether 2022-09-18 09:22:35 -04:00
Elliot Nelson ae920eaa93 feat(git): cherry-pick keyword supports tag attribute 2022-09-17 23:57:32 -04: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
Knut Sveidqvist 9c88c785cb Fix for issues in errorhandling and class diagrams after refactoring 2022-09-16 14:05:15 +02:00
ashishj 4c5d813e58 Fixed Linting issues 2022-09-16 09:25:22 +02:00
Sidharth Vinod 539ee49594
Merge remote-tracking branch 'origin/release/9.1.7' into sidv/mergeRelease 
* origin/release/9.1.7:
  Release 9.1.7
  Fix for broken rendering test
  Fix for issue #3428, load the configured diagrams even when initialize has not been called.
 2022-09-14 11:11:12 +05:30
Alois Klink 625ec813b9 chore: upgrade cypress to v10 
Cypress v10 had some minor breaking changes,
(e.g. the cypress/plugins folder dissapeared)
so I had to change some things.

It looks like the Cypress was previously reverted in [dee9cfe][1],
due to applitools not working properly,
but I think my changes fix this, so it should be okay.

[1]: dee9cfea85
 2022-09-14 04:15:52 +01:00
Alois Klink 595f7680e9 fix(flowchart-v2): fix arrowMarkerAbsolute=true 
The if-check for arrowMarkerAbsolute in the flowchart-v2 code is in
dagre-wrapper. Unfortunately, I can't seem to find a way to find the
local conf (e.g. the one set via `flowRenderer.setConf()`, so instead
I'm using global mermaid config from `src/config`.

Flowchart v1 arrowMarkerAbsolute=true is still broken, but I'm not
really sure how to fix that.
 2022-09-14 04:15:52 +01:00