mirror of
https://github.com/mermaid-js/mermaid.git
synced 2025-08-15 14:29:25 +02:00
Merge branch 'develop' into pr/gregberge/5577
* develop: Removed unused patch Fix cytoscape patch chore: Remove cytoscape patch. docs: fix node version in CONTRIBUTING.md Fixed entrypoint path
This commit is contained in:
@@ -1,4 +1,3 @@
|
|||||||
version: '3.9'
|
|
||||||
services:
|
services:
|
||||||
mermaid:
|
mermaid:
|
||||||
build:
|
build:
|
||||||
@@ -8,7 +7,7 @@ services:
|
|||||||
tty: true
|
tty: true
|
||||||
working_dir: /mermaid
|
working_dir: /mermaid
|
||||||
mem_limit: '8G'
|
mem_limit: '8G'
|
||||||
entrypoint: docker-entrypoint.sh
|
entrypoint: ./docker-entrypoint.sh
|
||||||
environment:
|
environment:
|
||||||
- NODE_OPTIONS=--max_old_space_size=8192
|
- NODE_OPTIONS=--max_old_space_size=8192
|
||||||
volumes:
|
volumes:
|
||||||
@@ -16,6 +15,7 @@ services:
|
|||||||
- root_cache:/root/.cache
|
- root_cache:/root/.cache
|
||||||
- root_local:/root/.local
|
- root_local:/root/.local
|
||||||
- root_npm:/root/.npm
|
- root_npm:/root/.npm
|
||||||
|
- /tmp:/tmp
|
||||||
ports:
|
ports:
|
||||||
- 9000:9000
|
- 9000:9000
|
||||||
- 3333:3333
|
- 3333:3333
|
||||||
|
@@ -56,7 +56,7 @@ The following commands must be sufficient enough to start with:
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
curl -fsSL https://get.pnpm.io/install.sh | sh -
|
curl -fsSL https://get.pnpm.io/install.sh | sh -
|
||||||
pnpm env use --global 18
|
pnpm env use --global 20
|
||||||
```
|
```
|
||||||
|
|
||||||
You may also need to reload `.shrc` or `.bashrc` afterwards.
|
You may also need to reload `.shrc` or `.bashrc` afterwards.
|
||||||
|
@@ -52,7 +52,7 @@ The following commands must be sufficient enough to start with:
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
curl -fsSL https://get.pnpm.io/install.sh | sh -
|
curl -fsSL https://get.pnpm.io/install.sh | sh -
|
||||||
pnpm env use --global 18
|
pnpm env use --global 20
|
||||||
```
|
```
|
||||||
|
|
||||||
You may also need to reload `.shrc` or `.bashrc` afterwards.
|
You may also need to reload `.shrc` or `.bashrc` afterwards.
|
||||||
|
12
pnpm-lock.yaml
generated
12
pnpm-lock.yaml
generated
@@ -11020,7 +11020,7 @@ snapshots:
|
|||||||
'@babel/helper-split-export-declaration': 7.24.5
|
'@babel/helper-split-export-declaration': 7.24.5
|
||||||
'@babel/parser': 7.24.5
|
'@babel/parser': 7.24.5
|
||||||
'@babel/types': 7.24.5
|
'@babel/types': 7.24.5
|
||||||
debug: 4.3.4(supports-color@8.1.1)
|
debug: 4.3.5
|
||||||
globals: 11.12.0
|
globals: 11.12.0
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
@@ -13194,7 +13194,7 @@ snapshots:
|
|||||||
|
|
||||||
agent-base@6.0.2:
|
agent-base@6.0.2:
|
||||||
dependencies:
|
dependencies:
|
||||||
debug: 4.3.4(supports-color@8.1.1)
|
debug: 4.3.5
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
@@ -13389,7 +13389,7 @@ snapshots:
|
|||||||
avvio@7.2.5:
|
avvio@7.2.5:
|
||||||
dependencies:
|
dependencies:
|
||||||
archy: 1.0.0
|
archy: 1.0.0
|
||||||
debug: 4.3.4(supports-color@8.1.1)
|
debug: 4.3.5
|
||||||
fastq: 1.17.1
|
fastq: 1.17.1
|
||||||
queue-microtask: 1.2.3
|
queue-microtask: 1.2.3
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
@@ -15345,7 +15345,7 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
chalk: 4.1.2
|
chalk: 4.1.2
|
||||||
commander: 5.1.0
|
commander: 5.1.0
|
||||||
debug: 4.3.4(supports-color@8.1.1)
|
debug: 4.3.5
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
@@ -15770,7 +15770,7 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@tootallnate/once': 2.0.0
|
'@tootallnate/once': 2.0.0
|
||||||
agent-base: 6.0.2
|
agent-base: 6.0.2
|
||||||
debug: 4.3.4(supports-color@8.1.1)
|
debug: 4.3.5
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
@@ -15826,7 +15826,7 @@ snapshots:
|
|||||||
https-proxy-agent@5.0.1:
|
https-proxy-agent@5.0.1:
|
||||||
dependencies:
|
dependencies:
|
||||||
agent-base: 6.0.2
|
agent-base: 6.0.2
|
||||||
debug: 4.3.4(supports-color@8.1.1)
|
debug: 4.3.5
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user