Skip to content

Commit 48ff3b2

Browse files
sidharthv96sidharthv96
committed
Merge branch 'next' into pr/Yokozuna59/4751
* next: (118 commits) Update Deps chore(deps): update all patch dependencies fix typo cutomers => customers chore(deps): update all minor dependencies Fix macOS onboarding issues Bump @zenuml/core and update render options in mermaid-zenuml (mermaid-js#5257) Fixed Typo in ErrorRenderer.ts (mermaid-js#5256) mermaid-js#3358 Removing redundant file mermaid-js#3358 Fix after review Fix selector mermaid-js#3358 Renaming of IOperation to ActionFun chore: Add interface naming build(deps-dev): bump vite from 4.4.12 to 4.5.2 Update container Update container Remove pnpm cache 3358 Adding types for blockArrowHelper #3358n Updated lockfile Update docs mermaid-js#3358 Another set of review changes ...
2 parents b30d609 + eee0d4b commit 48ff3b2

File tree

93 files changed

+8634
-3511
lines changed

Some content is hidden

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

93 files changed

+8634
-3511
lines changed

‎.build/jsonSchema.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { load, JSON_SCHEMA } from 'js-yaml';
22
import assert from 'node:assert';
33
import Ajv2019, { type JSONSchemaType } from 'ajv/dist/2019.js';
4-
54
import type { MermaidConfig, BaseDiagramConfig } from '../packages/mermaid/src/config.type.js';
65

76
/**
@@ -24,6 +23,7 @@ const MERMAID_CONFIG_DIAGRAM_KEYS = [
2423
'gitGraph',
2524
'c4',
2625
'sankey',
26+
'block',
2727
'packet',
2828
] as const;
2929

‎.eslintrc.cjs

+11
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,17 @@ module.exports = {
6363
minimumDescriptionLength: 10,
6464
},
6565
],
66+
'@typescript-eslint/naming-convention': [
67+
'error',
68+
{
69+
selector: 'typeLike',
70+
format: ['PascalCase'],
71+
custom: {
72+
regex: '^I[A-Z]',
73+
match: false,
74+
},
75+
},
76+
],
6677
'json/*': ['error', 'allowComments'],
6778
'@cspell/spellchecker': [
6879
'error',

‎.github/ISSUE_TEMPLATE/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ contact_links:
44
url: https://github.com/mermaid-js/mermaid/discussions
55
about: Ask the Community questions or share your own graphs in our discussions.
66
- name: Discord
7-
url: https://discord.gg/wwtabKgp8y
7+
url: https://discord.gg/AgrbSrBer3
88
about: Join our Community on Discord for Help and a casual chat.
99
- name: Documentation
1010
url: https://mermaid.js.org

‎.github/workflows/build-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/setup-node@v4
2525
with:
2626
cache: pnpm
27-
node-version: 18
27+
node-version-file: '.node-version'
2828

2929
- name: Install Packages
3030
run: pnpm install --frozen-lockfile

‎.github/workflows/build.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,17 @@ permissions:
1515
jobs:
1616
build-mermaid:
1717
runs-on: ubuntu-latest
18-
strategy:
19-
matrix:
20-
node-version: [18.x]
2118
steps:
2219
- uses: actions/checkout@v4
2320

2421
- uses: pnpm/action-setup@v2
2522
# uses version from "packageManager" field in package.json
2623

27-
- name: Setup Node.js ${{ matrix.node-version }}
24+
- name: Setup Node.js
2825
uses: actions/setup-node@v4
2926
with:
3027
cache: pnpm
31-
node-version: ${{ matrix.node-version }}
28+
node-version-file: '.node-version'
3229

3330
- name: Install Packages
3431
run: |

‎.github/workflows/e2e-applitools.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ env:
2121
jobs:
2222
e2e-applitools:
2323
runs-on: ubuntu-latest
24-
strategy:
25-
matrix:
26-
node-version: [18.x]
24+
container:
25+
image: cypress/browsers:node-20.11.0-chrome-121.0.6167.85-1-ff-120.0-edge-121.0.2277.83-1
26+
options: --user 1001
2727
steps:
2828
- if: ${{ ! env.USE_APPLI }}
2929
name: Warn if not using Applitools
@@ -35,10 +35,10 @@ jobs:
3535
- uses: pnpm/action-setup@v2
3636
# uses version from "packageManager" field in package.json
3737

38-
- name: Setup Node.js ${{ matrix.node-version }}
38+
- name: Setup Node.js
3939
uses: actions/setup-node@v4
4040
with:
41-
node-version: ${{ matrix.node-version }}
41+
node-version-file: '.node-version'
4242

4343
- if: ${{ env.USE_APPLI }}
4444
name: Notify applitools of new batch

‎.github/workflows/e2e.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,16 @@ env:
2323
jobs:
2424
cache:
2525
runs-on: ubuntu-latest
26+
container:
27+
image: cypress/browsers:node-20.11.0-chrome-121.0.6167.85-1-ff-120.0-edge-121.0.2277.83-1
28+
options: --user 1001
2629
steps:
2730
- uses: actions/checkout@v4
2831
- uses: pnpm/action-setup@v2
2932
- name: Setup Node.js
3033
uses: actions/setup-node@v4
3134
with:
32-
node-version: 18.x
35+
node-version-file: '.node-version'
3336
- name: Cache snapshots
3437
id: cache-snapshot
3538
uses: actions/cache@v4
@@ -56,22 +59,24 @@ jobs:
5659

5760
e2e:
5861
runs-on: ubuntu-latest
62+
container:
63+
image: cypress/browsers:node-20.11.0-chrome-121.0.6167.85-1-ff-120.0-edge-121.0.2277.83-1
64+
options: --user 1001
5965
needs: cache
6066
strategy:
6167
fail-fast: false
6268
matrix:
63-
node-version: [18.x]
6469
containers: [1, 2, 3, 4]
6570
steps:
6671
- uses: actions/checkout@v4
6772

6873
- uses: pnpm/action-setup@v2
6974
# uses version from "packageManager" field in package.json
7075

71-
- name: Setup Node.js ${{ matrix.node-version }}
76+
- name: Setup Node.js
7277
uses: actions/setup-node@v4
7378
with:
74-
node-version: ${{ matrix.node-version }}
79+
node-version-file: '.node-version'
7580

7681
# These cached snapshots are downloaded, providing the reference snapshots.
7782
- name: Cache snapshots

‎.github/workflows/link-checker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
restore-keys: cache-lychee-
3737

3838
- name: Link Checker
39-
uses: lycheeverse/[email protected].1
39+
uses: lycheeverse/[email protected].3
4040
with:
4141
args: >-
4242
--config .github/lychee.toml

‎.github/workflows/lint.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,17 @@ permissions:
1616
jobs:
1717
lint:
1818
runs-on: ubuntu-latest
19-
strategy:
20-
matrix:
21-
node-version: [18.x]
2219
steps:
2320
- uses: actions/checkout@v4
2421

2522
- uses: pnpm/action-setup@v2
2623
# uses version from "packageManager" field in package.json
2724

28-
- name: Setup Node.js ${{ matrix.node-version }}
25+
- name: Setup Node.js
2926
uses: actions/setup-node@v4
3027
with:
3128
cache: pnpm
32-
node-version: ${{ matrix.node-version }}
29+
node-version-file: '.node-version'
3330

3431
- name: Install Packages
3532
run: |

‎.github/workflows/publish-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/setup-node@v4
3232
with:
3333
cache: pnpm
34-
node-version: 18
34+
node-version-file: '.node-version'
3535

3636
- name: Install Packages
3737
run: pnpm install --frozen-lockfile

‎.github/workflows/release-preview-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/setup-node@v4
2020
with:
2121
cache: pnpm
22-
node-version: 18.x
22+
node-version-file: '.node-version'
2323

2424
- name: Install Packages
2525
run: |

‎.github/workflows/release-publish.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
- uses: pnpm/action-setup@v2
1515
# uses version from "packageManager" field in package.json
1616

17-
- name: Setup Node.js v18
17+
- name: Setup Node.js
1818
uses: actions/setup-node@v4
1919
with:
2020
cache: pnpm
21-
node-version: 18.x
21+
node-version-file: '.node-version'
2222

2323
- name: Install Packages
2424
run: |

‎.github/workflows/test.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,17 @@ permissions:
88
jobs:
99
unit-test:
1010
runs-on: ubuntu-latest
11-
strategy:
12-
matrix:
13-
node-version: [18.x]
1411
steps:
1512
- uses: actions/checkout@v4
1613

1714
- uses: pnpm/action-setup@v2
1815
# uses version from "packageManager" field in package.json
1916

20-
- name: Setup Node.js ${{ matrix.node-version }}
17+
- name: Setup Node.js
2118
uses: actions/setup-node@v4
2219
with:
2320
cache: pnpm
24-
node-version: ${{ matrix.node-version }}
21+
node-version-file: '.node-version'
2522

2623
- name: Install Packages
2724
run: |

‎.node-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v20.11.0

‎.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
registry=https://registry.npmjs.org
22
auto-install-peers=true
33
strict-peer-dependencies=false
4+
package-import-method=clone-or-copy

‎.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
dist
22
cypress/platform/xss3.html
33
.cache
4+
.pnpm-store
45
coverage
56
# Autogenerated by PNPM
67
pnpm-lock.yaml

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FROM node:18.19.0-alpine3.18 AS base
1+
FROM node:20.11.0-alpine3.19 AS base
22
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
@@ -15,7 +15,7 @@ Generate diagrams from markdown-like text.
1515
<a href="https://mermaid.live/"><b>Live Editor!</b></a>
1616
</p>
1717
<p align="center">
18-
<a href="https://mermaid.js.org">📖 Documentation</a> | <a href="https://mermaid.js.org/intro/">🚀 Getting Started</a> | <a href="https://www.jsdelivr.com/package/npm/mermaid">🌐 CDN</a> | <a href="https://discord.gg/wwtabKgp8y" title="Discord invite">🙌 Join Us</a>
18+
<a href="https://mermaid.js.org">📖 Documentation</a> | <a href="https://mermaid.js.org/intro/">🚀 Getting Started</a> | <a href="https://www.jsdelivr.com/package/npm/mermaid">🌐 CDN</a> | <a href="https://discord.gg/AgrbSrBer3" title="Discord invite">🙌 Join Us</a>
1919
</p>
2020
<p align="center">
2121
<a href="./README.zh-CN.md">简体中文</a>
@@ -33,7 +33,7 @@ Try Live Editor previews of future releases: <a href="https://develop.git.mermai
3333
[![Coverage Status](https://codecov.io/github/mermaid-js/mermaid/branch/develop/graph/badge.svg)](https://app.codecov.io/github/mermaid-js/mermaid/tree/develop)
3434
[![CDN Status](https://img.shields.io/jsdelivr/npm/hm/mermaid)](https://www.jsdelivr.com/package/npm/mermaid)
3535
[![NPM Downloads](https://img.shields.io/npm/dm/mermaid)](https://www.npmjs.com/package/mermaid)
36-
[![Join our Discord!](https://img.shields.io/static/v1?message=join%20chat&color=9cf&logo=discord&label=discord)](https://discord.gg/wwtabKgp8y)
36+
[![Join our Discord!](https://img.shields.io/static/v1?message=join%20chat&color=9cf&logo=discord&label=discord)](https://discord.gg/AgrbSrBer3)
3737
[![Twitter Follow](https://img.shields.io/badge/Social-mermaidjs__-blue?style=social&logo=X)](https://twitter.com/mermaidjs_)
3838

3939
<img src="./img/header.png" alt="" />

‎README.zh-CN.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Mermaid
1515
<a href="https://mermaid.live/"><b>实时编辑器!</b></a>
1616
</p>
1717
<p align="center">
18-
<a href="https://mermaid.js.org">📖 文档</a> | <a href="https://mermaid.js.org/intro/">🚀 入门</a> | <a href="https://www.jsdelivr.com/package/npm/mermaid">🌐 CDN</a> | <a href="https://discord.gg/wwtabKgp8y" title="Discord invite">🙌 加入我们</a>
18+
<a href="https://mermaid.js.org">📖 文档</a> | <a href="https://mermaid.js.org/intro/">🚀 入门</a> | <a href="https://www.jsdelivr.com/package/npm/mermaid">🌐 CDN</a> | <a href="https://discord.gg/AgrbSrBer3" title="Discord invite">🙌 加入我们</a>
1919
</p>
2020
<p align="center">
2121
<a href="./README.md">English</a>
@@ -34,7 +34,7 @@ Mermaid
3434
[![Coverage Status](https://codecov.io/github/mermaid-js/mermaid/branch/develop/graph/badge.svg)](https://app.codecov.io/github/mermaid-js/mermaid/tree/develop)
3535
[![CDN Status](https://img.shields.io/jsdelivr/npm/hm/mermaid)](https://www.jsdelivr.com/package/npm/mermaid)
3636
[![NPM Downloads](https://img.shields.io/npm/dm/mermaid)](https://www.npmjs.com/package/mermaid)
37-
[![Join our Discord!](https://img.shields.io/static/v1?message=join%20chat&color=9cf&logo=discord&label=discord)](https://discord.gg/wwtabKgp8y)
37+
[![Join our Discord!](https://img.shields.io/static/v1?message=join%20chat&color=9cf&logo=discord&label=discord)](https://discord.gg/AgrbSrBer3)
3838
[![Twitter Follow](https://img.shields.io/badge/Social-mermaidjs__-blue?style=social&logo=X)](https://twitter.com/mermaidjs_)
3939

4040
<img src="./img/header.png" alt="" />

‎cSpell.json

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"codedoc",
2929
"codemia",
3030
"colour",
31+
"colours",
3132
"commitlint",
3233
"cpettitt",
3334
"customizability",

0 commit comments

Comments
 (0)