Skip to content

Commit 2525966

Browse files
authored
Merge pull request #5132 from nirname/docs/2910_update-contributing-guidelines
Contribution documentation improvements
2 parents 8788b49 + 36fdff8 commit 2525966

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1440
-1187
lines changed

.github/pull_request_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ Make sure you
1414

1515
- [ ] :book: have read the [contribution guidelines](https://github.com/mermaid-js/mermaid/blob/develop/CONTRIBUTING.md)
1616
- [ ] :computer: have added necessary unit/e2e tests.
17-
- [ ] :notebook: have added documentation. Make sure [`MERMAID_RELEASE_VERSION`](https://github.com/mermaid-js/mermaid/blob/develop/packages/mermaid/src/docs/community/development.md#3-update-documentation) is used for all new features.
17+
- [ ] :notebook: have added documentation. Make sure [`MERMAID_RELEASE_VERSION`](https://github.com/mermaid-js/mermaid/blob/develop/packages/mermaid/src/docs/community/contributing.md#update-documentation) is used for all new features.
1818
- [ ] :bookmark: targeted `develop` branch

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ stats/
4646

4747
demos/dev/**
4848
!/demos/dev/example.html
49+
tsx-0/**

CONTRIBUTING.md

-78
This file was deleted.

CONTRIBUTING.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
./packages/mermaid/src/docs/community/contributing.md

Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
FROM node:18.19.0-alpine3.18 AS base
2+
RUN wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.shrc" SHELL="$(which sh)" sh -

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ Mermaid addresses this problem by enabling users to create easily modifiable dia
7474
<br/>
7575

7676
Mermaid allows even non-programmers to easily create detailed diagrams through the [Mermaid Live Editor](https://mermaid.live/).<br/>
77-
For video tutorials, visit our [Tutorials](./docs/config/Tutorials.md) page.
77+
For video tutorials, visit our [Tutorials](./docs/ecosystem/tutorials.md) page.
7878
Use Mermaid with your favorite applications, check out the list of [Integrations and Usages of Mermaid](./docs/ecosystem/integrations-community.md).
7979

8080
You can also use Mermaid within [GitHub](https://github.blog/2022-02-14-include-diagrams-markdown-files-mermaid/) as well many of your other favorite applications—check out the list of [Integrations and Usages of Mermaid](./docs/ecosystem/integrations-community.md).
8181

82-
For a more detailed introduction to Mermaid and some of its more basic uses, look to the [Beginner's Guide](./docs/intro/getting-started.md), [Usage](./docs/config/usage.md) and [Tutorials](./docs/config/Tutorials.md).
82+
For a more detailed introduction to Mermaid and some of its more basic uses, look to the [Beginner's Guide](./docs/intro/getting-started.md), [Usage](./docs/config/usage.md) and [Tutorials](./docs/ecosystem/tutorials.md).
8383

8484
In our release process we rely heavily on visual regression tests using [applitools](https://applitools.com/). Applitools is a great service which has been easy to use and integrate with our tests.
8585

README.zh-CN.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ Mermaid 是一个基于 Javascript 的图表绘制工具,通过解析类 Markd
5757
Mermaid 通过允许用户创建便于修改的图表来解决这一难题,它也可以作为生产脚本(或其他代码)的一部分。<br/>
5858
<br/>
5959
Mermaid 甚至能让非程序员也能通过 [Mermaid Live Editor](https://mermaid.live/) 轻松创建详细的图表。<br/>
60-
你可以访问 [教程](./docs/config/Tutorials.md) 来查看 Live Editor 的视频教程,也可以查看 [Mermaid 的集成和使用](./docs/ecosystem/integrations-community.md) 这个清单来检查你的文档工具是否已经集成了 Mermaid 支持。
60+
你可以访问 [教程](./docs/ecosystem/tutorials.md) 来查看 Live Editor 的视频教程,也可以查看 [Mermaid 的集成和使用](./docs/ecosystem/integrations-community.md) 这个清单来检查你的文档工具是否已经集成了 Mermaid 支持。
6161

62-
如果想要查看关于 Mermaid 更详细的介绍及基础使用方式,可以查看 [入门指引](./docs/intro/getting-started.md), [用法](./docs/config/usage.md)[教程](./docs/config/Tutorials.md).
62+
如果想要查看关于 Mermaid 更详细的介绍及基础使用方式,可以查看 [入门指引](./docs/intro/getting-started.md), [用法](./docs/config/usage.md)[教程](./docs/ecosystem/tutorials.md).
6363

6464
<!-- </Main description> -->
6565

docker-compose.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
version: '3.9'
22
services:
33
mermaid:
4-
image: node:18.19.0-alpine3.18
4+
build:
5+
context: .
6+
dockerfile: Dockerfile
57
stdin_open: true
68
tty: true
79
working_dir: /mermaid
8-
mem_limit: '4G'
10+
mem_limit: '8G'
11+
entrypoint: '/mermaid/docker-entrypoint.sh'
912
environment:
10-
- NODE_OPTIONS=--max_old_space_size=4096
13+
- NODE_OPTIONS=--max_old_space_size=8192
1114
volumes:
1215
- ./:/mermaid
1316
- root_cache:/root/.cache

docker-entrypoint.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
source /root/.shrc
3+
exec "$@"

docs/community/code.md

-176
This file was deleted.

0 commit comments

Comments
 (0)