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

5331 Commits

Author SHA1 Message Date
Knut Sveidqvist d78adc6fb9
Merge pull request #3367 from dbartholomae/add_tests_for_C4_system_context_macros 
Add tests for C4 system context macros
 2022-09-09 09:35:51 +02:00
Sidharth Vinod 2611a430b9
Merge pull request #3405 from aloisklink/other/3339_forbid-console-in-src-code 
style: forbid using `console` in mermaid src code
 2022-09-09 08:32:55 +05:30
Alois Klink 6e81ee9d97
Merge branch 'develop' into other/3339_forbid-console-in-src-code 
Fixes merge conflict in:
  - .eslintrc.json due to 6167eda6b6
  - lint.yml due to 5674f8e675
 2022-09-07 21:00:42 +01:00
Sidharth Vinod 3986f48199
fix: Tsconfig 2022-09-08 00:34:52 +05:30
Sidharth Vinod e310af7673
Update prettier 2022-09-07 20:54:19 +05:30
Sidharth Vinod bb2002fce2
chore: Run postbuild with prepare 
As postbuild was not running with prepare, PR that updated `documentation` package was green,  although it should've failed.
 2022-09-07 20:51:46 +05:30
Sidharth Vinod 24bd55c360
Merge pull request #3419 from weedySeaDragon/docs/bug-3417-change_src_docs_only 
Docs/bug 3417
 2022-09-07 20:41:57 +05:30
Ashley Engelund (weedySeaDragon @ github) 04a25092f4 (formatting) prettier fix 2022-09-07 06:40:26 -07:00
Ashley Engelund (weedySeaDragon @ github) b7cf7beb22 Merge remote-tracking branch 'MERMAID/develop' into docs/bug-3417-change_src_docs_only 2022-09-07 06:36:13 -07:00
Knut Sveidqvist c50a7533f6 Removed warnings in the grammar oand some console logging 2022-09-07 12:38:26 +02:00
Sidharth Vinod c0dd6f9e35
Merge pull request #3422 from weedySeaDragon/chore/3421_fix_jsdoc_lint_errors 
chore: fix JSDOC @param, @returns lint errors
 2022-09-06 15:16:45 +05:30
Knut Sveidqvist 97ed63de5a
Merge pull request #3392 from aloisklink/fix/3347_support_branch_names_that_start_with_numbers 
fix(git): support numeric branch names
 2022-09-06 06:49:53 +02:00
Alois Klink 22d20cc76e ci: lint .jison files for any console.log() 
Converts the *.jison files into .js, then lints them using just
the `no-console` rule.

To keep things simple, I've just made this run only on CI.

If we want to do more complex linting on `*.jison` files, it might
be worth making an `eslint-plugin-jison`, so that we can directly
parse jison in ESLint.
 2022-09-06 04:29:09 +01:00
Ashley Engelund (weedySeaDragon @ github) 91363f7aed fix JSDOC @param, @returns; fixed a few minor typos in comments 2022-09-05 19:45:33 -07:00
Ashley Engelund (weedySeaDragon @ github) aa42aabb30 unmangle sentence about doc changes committed and showing up on docsify site 2022-09-05 17:01:03 -07:00
Ashley Engelund (weedySeaDragon @ github) 0780668239 change references from /docs to /src/docs; rework doc section in CONTRIBUTING 2022-09-05 16:54:31 -07:00
Ashish Jain 7e68e06a3a
Merge pull request #3410 from mermaid-js/minmaps 
Mindmaps
 2022-09-05 20:54:00 +02:00
Knut Sveidqvist 030cbb1acb Update after lint comments 2022-09-05 20:40:12 +02:00
Knut Sveidqvist 1ccd3183c4 Merge branch 'develop' into minmaps 2022-09-05 20:14:23 +02:00
Sidharth Vinod 5a44b7341c
Merge pull request #3412 from mermaid-js/dependabot/npm_and_yarn/develop/babel-jest-29.0.2 
chore(deps-dev): bump babel-jest from 29.0.1 to 29.0.2
 2022-09-05 23:41:37 +05:30
Sidharth Vinod bd5933a65b
Merge pull request #3415 from mrmanc/feature/fix_directive_docs_copy_paste 
Update duplicate copy pasted directive description
 2022-09-05 23:35:06 +05:30
Sidharth Vinod 7b60ac1735
Merge pull request #3411 from mermaid-js/dependabot/npm_and_yarn/develop/typescript-4.8.2 
chore(deps-dev): bump typescript from 4.7.4 to 4.8.2
 2022-09-05 23:33:24 +05:30
Mark Crossfield 0aacc67b7a Regenerate the directive docs as I changed them 2022-09-05 17:58:04 +01:00
dependabot[bot] 4d523112d4
chore(deps-dev): bump typescript from 4.7.4 to 4.8.2 
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.7.4 to 4.8.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.7.4...v4.8.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-05 16:50:16 +00:00
Mark Crossfield 818195f2e4
Update duplicate copy pasted directive description 
Looked like the description for changing the theme via a directive had been copied to a couple of other use cases.
 2022-09-05 17:24:34 +01:00
Sidharth Vinod 8020ab9f78
Merge pull request #3413 from mermaid-js/dependabot/npm_and_yarn/develop/jest-environment-jsdom-29.0.2 
chore(deps-dev): bump jest-environment-jsdom from 29.0.1 to 29.0.2
 2022-09-05 21:35:18 +05:30
Sidharth Vinod 3e2ca5fe54
Merge pull request #3414 from mermaid-js/dependabot/npm_and_yarn/develop/types/dompurify-2.3.4 
chore(deps-dev): bump @types/dompurify from 2.3.3 to 2.3.4
 2022-09-05 21:08:59 +05:30
Knut Sveidqvist 579dbc8f63
Merge pull request #3401 from mermaid-js/sidv/docs 
Auto transform `mermaid-example` in docs.
 2022-09-05 16:35:55 +02:00
Sidharth Vinod 5ae1bd92cd
Build docs 2022-09-05 19:48:38 +05:30
dependabot[bot] 41e1001050
chore(deps-dev): bump @types/dompurify from 2.3.3 to 2.3.4 
Bumps [@types/dompurify](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/dompurify) from 2.3.3 to 2.3.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/dompurify)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-05 14:15:32 +00:00
dependabot[bot] 560bd83fb1
chore(deps-dev): bump jest-environment-jsdom from 29.0.1 to 29.0.2 
Bumps [jest-environment-jsdom](https://github.com/facebook/jest/tree/HEAD/packages/jest-environment-jsdom) from 29.0.1 to 29.0.2.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.0.2/packages/jest-environment-jsdom)

---
updated-dependencies:
- dependency-name: jest-environment-jsdom
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-05 14:15:19 +00:00
dependabot[bot] 0b4987431e
chore(deps-dev): bump babel-jest from 29.0.1 to 29.0.2 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 29.0.1 to 29.0.2.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.0.2/packages/babel-jest)

---
updated-dependencies:
- dependency-name: babel-jest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-05 14:14:23 +00:00
Sidharth Vinod 5e9db250bc
Merge branch 'develop' into sidv/docs 
* develop:
  chore: update browsers list
  Fix pre
  Prettier pass
  Fix XSS htmls
  fix #3407 Replace `div` with `pre` and format
 2022-09-05 19:30:39 +05:30
Knut Sveidqvist 47490e9820 Lint fixes 2022-09-05 15:57:12 +02:00
Knut Sveidqvist df7b5965c2
Merge branch 'develop' into minmaps 2022-09-05 15:35:24 +02:00
Knut Sveidqvist 8ad5f728c0 Removing requirement to add ids for nodes with a shape 2022-09-05 14:53:01 +02:00
Knut Sveidqvist 8b4a08eef4 #3336 Merged typescript changes 2022-09-05 14:04:39 +02:00
Knut Sveidqvist 01106caa59 Merged typescript changes 2022-09-05 11:22:17 +02:00
Knut Sveidqvist 047b7023a2 Updated with cloud and bang shapes 2022-09-05 09:54:00 +02:00
mmorel-35 d52c1f09d5 chore: update browsers list 2022-09-05 07:13:42 +00:00
Knut Sveidqvist afd1b6ed27
Merge pull request #3408 from mermaid-js/sidv/preTags 
fix #3407 Replace `div` with `pre` and format
 2022-09-05 07:07:21 +02:00
Sidharth Vinod 1f6e4a0887
Fix pre 2022-09-05 01:33:47 +05:30
Sidharth Vinod a95f46f513
Fix mermaid code formatting in html 2022-09-05 01:25:28 +05:30
Sidharth Vinod 98e9f5751a
Prettier pass 2022-09-05 01:00:47 +05:30
Sidharth Vinod 41dec4d159
Fix XSS htmls 2022-09-05 00:57:34 +05:30
Sidharth Vinod 91478caf5b
fix #3407 Replace `div` with `pre` and format 2022-09-05 00:48:36 +05:30
Sidharth Vinod 537ce4f630
Add change in `src/docs` 2022-09-04 13:31:58 +05:30
Sidharth Vinod f0c41a8280
Fix lint issue 2022-09-04 13:21:37 +05:30
Sidharth Vinod 22999e27f0
Merge branch 'develop' into sidv/docs 
* develop:
  build: run `build:prod` on `yarn prepare`
  Build documentation
  Fix typo
  Fix typo in documentation
  added mermerd to integrations documentation
 2022-09-04 13:12:44 +05:30
Sidharth Vinod a64a76db9b
Merge pull request #3403 from dbartholomae/patch-1 
Fix typo in documentation
 2022-09-04 12:56:57 +05:30