Commit Graph

2338 Commits

Author SHA1 Message Date
Sidharth Vinod
16a75de518 Merge branch 'knsv/new-shapes' into neo-new-shapes
* knsv/new-shapes:
  chore: changeset
  [autofix.ci] apply automated fixes
  test: fix gantt.spec.js type error
  test: await on `expect().resolves/rejects`
  build(types): disable preserveSymlinks in tsconfig
2024-09-17 21:02:04 +05:30
Sidharth Vinod
02851fd672 Merge remote-tracking branch 'upstream/develop' into knsv/new-shapes
* upstream/develop:
  [autofix.ci] apply automated fixes
  test: fix gantt.spec.js type error
  test: await on `expect().resolves/rejects`
  build(types): disable preserveSymlinks in tsconfig
2024-09-17 21:00:02 +05:30
autofix-ci[bot]
b74842ceb3 [autofix.ci] apply automated fixes 2024-09-17 12:46:35 +00:00
Ashish Jain
a23132e1f2 Merge from upstream new-shapes branch 2024-09-17 09:57:30 +02:00
saurabhg772244
775a6381b4 updated type and function signature 2024-09-17 12:50:20 +05:30
saurabhg772244
38c6ad5ad6 updated readme url t use kabab case 2024-09-17 12:39:46 +05:30
Sidharth Vinod
7b0b548d05 Merge branch 'neo-new-shapes' into sidv/configReturn
* neo-new-shapes:
  update type check for getTypeFromVertex
  [autofix.ci] apply automated fixes
  fixed build error
  Updated readme for renderOptions parameter and renamed to use kabab case
  Updated icon shape for background colour and icon colour
  Moving case check to parsing
  Adding case check
  Updated shape aliases
  Updated type
  Throwing error for invalid shape
  Updated insertNode to pass optional config
  Fix for amp and adjusted tests
  WIP
  Removing the ending @ sign in the shape data
2024-09-16 18:35:08 +05:30
Ashish Jain
48791aac13 Merge from upstream newShapes branch 2024-09-16 14:59:46 +02:00
autofix-ci[bot]
78f9238865 [autofix.ci] apply automated fixes 2024-09-16 07:39:10 +00:00
saurabhg772244
7f2044024b Updated readme for renderOptions parameter and renamed to use kabab case 2024-09-16 12:59:33 +05:30
Ashish Jain
61af74609a Updated shape aliases 2024-09-13 12:58:28 +02:00
Knut Sveidqvist
4162a25425 Fix for amp and adjusted tests 2024-09-12 16:58:52 +02:00
Sidharth Vinod
dc642fb5bc Build docs 2024-09-12 15:23:11 +05:30
Sidharth Vinod
ef428dc555 Merge branch 'neo-new-shapes' of https://github.com/Mermaid-Chart/alana-mermaid into sidv/configReturn
* 'neo-new-shapes' of https://github.com/Mermaid-Chart/alana-mermaid: (45 commits)
  updated styles, testcases and fixed html labels for image shape
  MC-1733 Reset layout
  updated ImageSqaure shape
  updated styles
  updated pos changes
  fixed html labels for icon shape
  updated test cases
  Added rounded icon shape
  Updated circle icon
  updated image shape
  Updated labels for shapes
  updated icon square and icon
  MC-1733 Reset layout
  Updated logic for vertex label
  Updated test cases
  Update .changeset/rude-meals-invite.md
  changesets
  added neo-fication and shape-resize for linedCylinder shape
  added neo-fication for curvedTrapezoid shape
  Version Packages
  ...
2024-09-12 15:19:21 +05:30
Ashish Jain
7ef296a9cf Merge from upstream newShapes branch 2024-09-11 14:41:52 +02:00
Ashish Jain
900c8a4209 Replace with relative path 2024-09-10 13:19:32 +02:00
saurabhg772244
06aa72ec16 Merge branch 'knsv/new-shapes' of https://github.com/mermaid-js/mermaid into saurabh/image-shape 2024-09-09 22:43:08 +05:30
saurabhg772244
82cc473801 Merge branch 'develop' of https://github.com/mermaid-js/mermaid into knsv/new-shapes 2024-09-09 19:37:59 +05:30
Sidharth Vinod
638be1992d Merge remote-tracking branch 'upstream/develop' into neo-new-shapes
* upstream/develop: (27 commits)
  [autofix.ci] apply automated fixes
  fix: Return type, make config non optional
  [autofix.ci] apply automated fixes
  Create red-beans-cross.md
  chore(deps): update dependency eslint-plugin-jsdoc to v50
  remove tsconfig compiler option paths
  linting
  replace mermaid/dist with relative paths
  chore: add git command and set safe dir
  chore: Fix check
  feat: Preview release
  feat: Return parsed config from `mermaid.parse`
  Version Packages
  Adding changeset
  Cleanup of test-file
  Updated cypress test for self-loops
  Fix for issues with self loops
  docs: Fix SMW link
  add blog post - architecture diagrams
  more , linting
  ...
2024-09-09 18:30:31 +05:30
Ashish Jain
e111965411 Added more tests, updated documentation, kebab-case changes 2024-09-09 14:59:03 +02:00
autofix-ci[bot]
d053284536 [autofix.ci] apply automated fixes 2024-09-09 12:11:29 +00:00
Sidharth Vinod
303f1f4545 Merge branch 'develop' into sidv/returnConfig
* develop:
  chore(deps): update dependency eslint-plugin-jsdoc to v50
  chore: add git command and set safe dir
  Version Packages
  Adding changeset
  Cleanup of test-file
  Updated cypress test for self-loops
  Fix for issues with self loops
  rebuild docs
  add another maybe-undefined operator elk
  pass linter
  fix import
  make rendering-util/types a real ts file
2024-09-09 17:19:28 +05:30
Ashish Jain
0ade03c4de Merge from develop 2024-09-09 11:15:42 +02:00
saurabhg772244
ec29f749af Merge branch 'develop' of https://github.com/mermaid-js/mermaid into saurabh/image-shape 2024-09-09 11:24:28 +05:30
Sidharth Vinod
64abf29ea8 feat: Return parsed config from mermaid.parse 2024-09-06 23:05:30 +05:30
Ashish Jain
e180ad0666 Merge branch 'knsv/new-shapes' of github.com:mermaid-js/mermaid into neo-new-shapes 2024-09-05 12:01:39 +02:00
Knut Sveidqvist
adedb5f803 Updated docs for braces 2024-09-05 11:44:12 +02:00
Ashish Jain
1b67997da2 Merge from upsteam, updated to version v11.1.0-b4 2024-09-05 10:58:04 +02:00
Knut Sveidqvist
3d4c5d1a41 Adding new shapes to flowchart documentation 2024-09-04 17:49:39 +02:00
Nicholas Bollweg
c078840c63 Merge branch 'develop' into gh-5747-rendering-util-types 2024-09-04 10:06:35 -04:00
Sidharth Vinod
bfc4abeae2 Merge branch 'master' into develop
* master:
  add blog post - architecture diagrams
2024-09-03 23:59:19 +05:30
Sidharth Vinod
cd67fdf89d docs: Fix SMW link 2024-09-03 23:58:55 +05:30
Sidharth Vinod
a6dbf0a9ee Merge branch 'master' of https://github.com/mermaid-js/mermaid into add-blog-posts
* 'master' of https://github.com/mermaid-js/mermaid: (197 commits)
  chore: Update changelogs
  Version Packages
  chore: Update repo name
  Revert "Version Packages"
  chore: Update permissions
  Version Packages
  Update nice-flowers-yawn.md
  Remove icons from docs links
  test: Add second icon pack
  feat: Lazy load icons
  test: Wrap in describe block
  chore: Update cypress
  [autofix.ci] apply automated fixes
  chore: Disable mermaid in SSR
  chore: update pnpm, remove dependency
  test: External diagram rendering test
  docs: Add external icons in demos
  [autofix.ci] apply automated fixes
  docs: Add iconify docs
  docs: Add iconify docs
  ...
2024-09-03 22:01:09 +05:30
Steph
31b4ec3e10 add blog post - architecture diagrams 2024-09-03 08:05:19 -07:00
Ashish Jain
11bb1a4a17 Merge from upstream 2024-09-03 11:55:46 +02:00
Ashish Jain
8e0bb994bb Merge from develop 2024-09-03 11:15:24 +02:00
Nicholas Bollweg
426d311faa Merge branch 'develop' into gh-5747-rendering-util-types 2024-09-02 16:41:55 -04:00
github-actions[bot]
9bcf614a9a Version Packages 2024-09-02 15:16:23 +00:00
Sidharth Vinod
10795b1d89 Revert "Version Packages"
This reverts commit 517c47b780.
2024-09-02 20:43:32 +05:30
github-actions[bot]
517c47b780 Version Packages 2024-09-02 15:05:24 +00:00
Sidharth Vinod
0edfab1048 feat: Lazy load icons
Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-09-02 19:51:14 +05:30
Sidharth Vinod
815e4b5748 Merge branch 'develop' into sidv/iconify 2024-09-02 18:19:27 +05:30
autofix-ci[bot]
0b127eecd9 [autofix.ci] apply automated fixes 2024-09-02 10:46:53 +00:00
Sidharth Vinod
69c9a564f2 chore: Disable mermaid in SSR 2024-09-02 16:11:33 +05:30
autofix-ci[bot]
7cda494bf4 [autofix.ci] apply automated fixes 2024-09-02 08:25:52 +00:00
Sidharth Vinod
2d8342261b docs: Add iconify docs 2024-09-02 13:50:50 +05:30
Sidharth Vinod
ef26fc921c docs: Add iconify docs 2024-09-02 13:20:34 +05:30
Nicholas Bollweg
73f8d70b86 rebuild docs 2024-08-30 09:21:11 -05:00
Knut Sveidqvist
dedf2d25e3 MC-1801 Fix for link id issue and intersection calculations 2024-08-29 11:58:30 +02:00
autofix-ci[bot]
249e18314a [autofix.ci] apply automated fixes 2024-08-29 09:36:26 +00:00