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
Knut Sveidqvist
383cbcf3a0 Merge branch 'develop' into minmaps 2022-10-03 07:02:25 +02:00
Knut Sveidqvist
56add0756f Lazy loading fix for example-diagram and mindmaps 2022-10-03 07:01:56 +02:00
Alois Klink
02a0f87562
Merge pull request #3541 from marcastel/patch-2 
Corrected theme variables reference table layout
 2022-10-03 02:11:57 +01:00
Alois Klink
feb1d34c1a style(docs): fix prettier issues (extra newline) 
Fix prettier issues by running `pnpm run lint:fix`
 2022-10-03 02:06:49 +01:00
JM Marcastel
ffe956e27b
Corrected theme variables reference table layout 
In replacement of #3540 which modified the generated file and not the source file.
 2022-10-02 05:31:41 +02:00
Alois Klink
03190c1dec
Merge pull request #3538 from elv-nate/patch-1 
Fix typos in README.md
 2022-09-30 22:20:14 +01:00
Nate Armstrong
92f1f2ffb6
Fix typos in README.md 2022-09-30 11:31:53 -07:00
Knut Sveidqvist
4d8d74a50d
Merge pull request #3536 from aloisklink/build/fix-pre-commit-rules 
Fix husky `pre-commit` rules
 2022-09-30 09:07:12 +02:00
Knut Sveidqvist
0dc0de8f1d
Merge pull request #3534 from aloisklink/build/fix-docsbuild-script 
Fix `docs:build` and `docs:verify` scripts
 2022-09-30 09:06:13 +02:00
Knut Sveidqvist
f5dc4d991f
Merge pull request #3535 from aloisklink/docs/replace-yarn-with-pnpm 
docs: replace `yarn` with `pnpm` in dev guide
 2022-09-30 09:05:29 +02:00
Alois Klink
1f3a02559c build: lint-staged docs in packages/mermaid/src/… 
When running lint-staged during git pre-commit scripts,
search for docs in the packages/mermaid/src/docs folder instead
of the original src/docs folder.
 2022-09-29 20:11:26 +01:00
Alois Klink
70f94c3e44 chore(docs): run pnpm run docs:build 
Updates the auto-generated warning to tell people
to edit packages/mermaid/src/docs instead of src/docs.
 2022-09-29 20:02:16 +01:00
Alois Klink
b8eab08119 build(docs): fix pnpm run docs:{build,verify} 
Our docs script was searching for docs in the src/docs folder,
which no longer exists.

Instead, it should be looking at the packages/mermaid/src/docs folder.
 2022-09-29 20:00:15 +01:00
Alois Klink
794b714fac docs: replace yarn with pnpm in dev guide 
With the new mono-repo move (PR #3531), development must
be done with `pnpm`.

Using `memaid` can still be done with `yarn`/`npm` however.
 2022-09-29 19:59:02 +01:00
Knut Sveidqvist
2f4b4ba13b
Merge pull request #3533 from mermaid-js/2979_arrow_alignment 
Arrow tip aligned to edge of box
 2022-09-29 20:49:22 +02:00
Alois Klink
1cdb0ff72c build: re-enable prepare script for husky setup 
Re-enables the `pnpm run prepare` script.

The prepare script is automatically run when running
`pnpm install` locally.

It both:
  - Sets up husky/git pre-commit scripts
  - Builds the `packages/mermaid/dist` folder.
 2022-09-29 19:48:54 +01:00
Alois Klink
9513e0e2d5 build: update pre-commit rules to use pnpm 
Update husky and lint-staged to use pnpm instead of yarn.
 2022-09-29 19:48:02 +01:00
Per Brolin
6ebfbb2f9e Arrow tip aligned to edge of box 2022-09-29 20:37:57 +02:00
pbrolin47
320e105ffe
Merge pull request #3531 from mermaid-js/3061_making_a_monorepo 
3061 making a monorepo
 2022-09-29 19:52:40 +02:00
Knut Sveidqvist
96cde8a15a updated pnpm-lock file 2022-09-29 19:35:54 +02:00
Knut Sveidqvist
972d025578 Merge branch 'develop' into 3061_making_a_monorepo 2022-09-29 16:28:57 +02:00
Knut Sveidqvist
09bc7e0acd Merge remote-tracking branch 'origin/develop' into develop 2022-09-29 16:25:09 +02:00
Alois Klink
693616b00d ci(e2e): Skip pnpm cache if skipping cypress run 
When running the e2e action from a fork, we prevent multi-processing
in the E2E cypress tests skipping runs that aren't
matrix.container == 1.

However, this means that the pnpm cache folder isn't created, causing
the cache action to throw an error.

To fix this, we also skip building Node/cache setup step.

Fixes: f60c7fff65458f39f17cbba30127dacd21a982ac
 2022-09-28 20:19:08 +01:00
Alois Klink
30f6550e61 ci(e2e): remove headless arg from cypress run 
Since [cypress-io/github-action v4.0.1][1], the headless argument
no longer exists.

Since Cypress v8.0.0, it didn't do anything, since this was the
default behaviour.

[1]: https://github.com/cypress-io/github-action/releases/tag/v4.0.1
 2022-09-28 20:12:40 +01:00
Alois Klink
5cfbc9102e build(dev): Fix dev server not showing mermaid.js 
When moving to the mono-repo,
`<script src="http://localhost:9000/mermaid.js"/>`
stopped working, since the vite dev server was exposing
the `./dist` folder, when the folder had moved to
the `./packages/mermaid/dist` folder.
 2022-09-28 19:52:31 +01:00
Knut Sveidqvist
766bdde46b Fixed sample test 2022-09-28 17:53:01 +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
bed9b1bb99 Removed test folder 2022-09-28 17:17:32 +02:00
Knut Sveidqvist
053a20bd33 Returning the borders to the e2e tests 2022-09-28 15:33:33 +02:00
Knut Sveidqvist
be34e6145f Fix for tests 2022-09-28 14:53:16 +02:00
Knut Sveidqvist
f60c7fff65 Merge branch 'develop' into 3061_making_a_monorepo 2022-09-28 14:26:07 +02:00
Knut Sveidqvist
6292bebcd3 Updated version 2022-09-28 14:15:17 +02:00
Knut Sveidqvist
80c68d847c
Merge pull request #3524 from ashleybartlett/feature/3078-support-dashes-in-participant-names 
[sequenceDiagrams] Support dashes in participant names
 2022-09-28 13:40:17 +02:00
Knut Sveidqvist
fed00be430
Merge pull request #3516 from weedySeaDragon/feature/3171--erDiagram-allow-chars-in-entity-name 
feat: ER diagram: allow other chars in a quoted entity name
 2022-09-28 13:29:54 +02:00
Knut Sveidqvist
ef527cb0fa
Merge branch 'develop' into feature/3171--erDiagram-allow-chars-in-entity-name 2022-09-28 13:24:54 +02:00
Knut Sveidqvist
e1c63139b2
Merge pull request #3512 from weedySeaDragon/bug/3429_er-dark-theme-attribute-colors 
fix: ER dark theme attribute colors
 2022-09-28 13:18:11 +02:00
Knut Sveidqvist
edb30c9feb
Merge branch 'develop' into bug/3429_er-dark-theme-attribute-colors 2022-09-28 13:17:00 +02:00
Knut Sveidqvist
66809ed972
Merge pull request #3513 from IanLee1521/patch-1 
Mention obsidian has native support for mermaid
 2022-09-28 13:12:54 +02:00
Knut Sveidqvist
c66d5cb890
Merge pull request #3523 from weedySeaDragon/chore/2904_fix-demo-charts-add-accTags 
chore: fix demo chart pages
 2022-09-28 13:12:15 +02:00
Knut Sveidqvist
fe8df78322 Clarification in the docs regarding directions in the subgraps for flowcharts. 2022-09-28 12:32:58 +02:00
Ashley Bartlett
7da6c0e867 Fix testing bug 2022-09-27 14:25:19 +10:00
Ashley Bartlett
0a0b6d51ba Add support for hyphens in participant names 2022-09-27 14:24:54 +10:00
Ashley Engelund (weedySeaDragon @ github)
7ed3c21a6d move charts to their pages; index page just a list to them 2022-09-26 18:16:36 -07:00
Ashley Engelund (weedySeaDragon @ github)
3d0214d453 new page for pie charts 2022-09-26 18:16:00 -07:00
Ashley Engelund (weedySeaDragon @ github)
d0e9de2744 new page for context charts 2022-09-26 18:15:29 -07:00
Ashley Engelund (weedySeaDragon @ github)
99264fab8a new page for git charts 2022-09-26 18:15:13 -07:00
Ashley Engelund (weedySeaDragon @ github)
d4519bb730 Merge remote-tracking branch 'origin/develop' into develop 2022-09-26 17:32:15 -07:00
Ashley Engelund (weedySeaDragon @ github)
6468c8e857 Merge remote-tracking branch 'MERMAID/develop' into develop 2022-09-26 17:31:56 -07:00
Knut Sveidqvist
982c1b4979 #3061 Lazy loading auto derived path 2022-09-26 14:22:21 +02:00
dependabot[bot]
503cbedc96
chore(deps-dev): bump @types/prettier from 2.7.0 to 2.7.1 (#3520) 
Bumps [@types/prettier](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/prettier) from 2.7.0 to 2.7.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/prettier)

---
updated-dependencies:
- dependency-name: "@types/prettier"
  dependency-type: direct:development
  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-26 13:28:16 +02:00