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

5935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
05a594a492 Fix for broken test 2022-10-03 11:22:06 +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
dependabot[bot]
eaf75fa149
chore(deps-dev): update husky requirement from ^8.0.0 to ^8.0.1 
Updates the requirements on [husky](https://github.com/typicode/husky) to permit the latest version.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](https://github.com/typicode/husky/compare/v8.0.0...v8.0.1)

---
updated-dependencies:
- dependency-name: husky
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-03 07:01:42 +00:00
dependabot[bot]
a6093e847e
chore(deps-dev): update @types/lodash requirement 
Updates the requirements on [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) to permit the latest version.
- [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
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-03 07:01:30 +00:00
dependabot[bot]
0a6c7781c4
chore(deps-dev): update @types/express requirement 
Updates the requirements on [@types/express](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/express) to permit the latest version.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/express)

---
updated-dependencies:
- dependency-name: "@types/express"
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-03 07:01:26 +00:00
dependabot[bot]
0871f5c012
chore(deps-dev): update start-server-and-test requirement 
Updates the requirements on [start-server-and-test](https://github.com/bahmutov/start-server-and-test) to permit the latest version.
- [Release notes](https://github.com/bahmutov/start-server-and-test/releases)
- [Commits](https://github.com/bahmutov/start-server-and-test/compare/v1.12.6...v1.14.0)

---
updated-dependencies:
- dependency-name: start-server-and-test
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-03 07:01:06 +00:00
dependabot[bot]
6f27c36186
chore(deps-dev): update @vitest/ui requirement from ^0.23.2 to ^0.23.4 
Updates the requirements on [@vitest/ui](https://github.com/vitest-dev/vitest/tree/HEAD/packages/ui) to permit the latest version.
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Commits](https://github.com/vitest-dev/vitest/commits/v0.23.4/packages/ui)

---
updated-dependencies:
- dependency-name: "@vitest/ui"
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-03 07:00:41 +00:00
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
Ashley Engelund (weedySeaDragon @ github)
fdb81be0a0 update demo diagrams to have lang, hr tags, src = mermaid.js where needed. 2022-10-02 13:51:25 -07:00
Andrew Liu
a4d1d86d7b Fixed labelText undefined behavior 2022-10-02 14:32:50 -04: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
Emerson Bottero
6191bb5f1b
Merge branch 'develop' into develop 2022-09-28 22:47:48 -03:00
Emerson Bottero
d858cd677e chore: update yarn.lock 2022-09-28 22:16:01 -03:00
Emerson Bottero
2376d38e0e docs: improved search 2022-09-28 21:46:07 -03: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