diff --git a/.build/types.ts b/.build/types.ts
index 419240782..9dec05a68 100644
--- a/.build/types.ts
+++ b/.build/types.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
import { packageOptions } from './common.js';
import { execSync } from 'child_process';
@@ -5,11 +6,17 @@ const buildType = (packageName: string) => {
console.log(`Building types for ${packageName}`);
try {
const out = execSync(`tsc -p ./packages/${packageName}/tsconfig.json --emitDeclarationOnly`);
- out.length > 0 && console.log(out.toString());
+ if (out.length > 0) {
+ console.log(out.toString());
+ }
} catch (e) {
console.error(e);
- e.stdout.length > 0 && console.error(e.stdout.toString());
- e.stderr.length > 0 && console.error(e.stderr.toString());
+ if (e.stdout.length > 0) {
+ console.error(e.stdout.toString());
+ }
+ if (e.stderr.length > 0) {
+ console.error(e.stderr.toString());
+ }
}
};
diff --git a/.cspell/code-terms.txt b/.cspell/code-terms.txt
index fa063616a..36d3b94c6 100644
--- a/.cspell/code-terms.txt
+++ b/.cspell/code-terms.txt
@@ -13,6 +13,7 @@ bqstring
BQUOTE
bramp
BRKT
+brotli
callbackargs
callbackname
classdef
@@ -111,6 +112,7 @@ STYLECLASS
STYLEOPTS
subcomponent
subcomponents
+subconfig
SUBROUTINEEND
SUBROUTINESTART
Subschemas
@@ -125,6 +127,7 @@ titlevalue
topbar
TRAPEND
TRAPSTART
+treemap
ts-nocheck
tsdoc
typeof
diff --git a/.cspell/contributors.txt b/.cspell/contributors.txt
index bd3ad9da2..b7f52f8d0 100644
--- a/.cspell/contributors.txt
+++ b/.cspell/contributors.txt
@@ -4,5 +4,6 @@ cpettitt
Dong Cai
Nikolay Rozhkov
Peng Xiao
+Per Brolin
subhash-halder
Vinod Sidharth
diff --git a/.cspell/libraries.txt b/.cspell/libraries.txt
index 9d2926186..71d2e18a4 100644
--- a/.cspell/libraries.txt
+++ b/.cspell/libraries.txt
@@ -20,6 +20,7 @@ dagre-d3
Deepdwn
Docsify
Docsy
+Doctave
DokuWiki
dompurify
elkjs
@@ -55,12 +56,14 @@ pyplot
redmine
rehype
rscratch
+shiki
sparkline
sphinxcontrib
ssim
stylis
Swimm
tsbuildinfo
+tseslint
Tuleap
Typora
unocss
diff --git a/.cspell/misc-terms.txt b/.cspell/misc-terms.txt
index 467e48891..0efd1dcc0 100644
--- a/.cspell/misc-terms.txt
+++ b/.cspell/misc-terms.txt
@@ -1 +1,4 @@
+BRANDES
+handdrawn
+KOEPF
newbranch
diff --git a/.esbuild/build.ts b/.esbuild/build.ts
index 3c87f9d62..505c18405 100644
--- a/.esbuild/build.ts
+++ b/.esbuild/build.ts
@@ -2,7 +2,8 @@ import { build } from 'esbuild';
import { mkdir, writeFile } from 'node:fs/promises';
import { packageOptions } from '../.build/common.js';
import { generateLangium } from '../.build/generateLangium.js';
-import { MermaidBuildOptions, defaultOptions, getBuildConfig } from './util.js';
+import type { MermaidBuildOptions } from './util.js';
+import { defaultOptions, getBuildConfig } from './util.js';
const shouldVisualize = process.argv.includes('--visualize');
@@ -35,11 +36,11 @@ const buildPackage = async (entryName: keyof typeof packageOptions) => {
if (shouldVisualize) {
for (const { metafile } of results) {
- if (!metafile) {
+ if (!metafile?.outputs) {
continue;
}
const fileName = Object.keys(metafile.outputs)
- .filter((file) => !file.includes('chunks') && file.endsWith('js'))[0]
+ .find((file) => !file.includes('chunks') && file.endsWith('js'))
.replace('dist/', '');
// Upload metafile into https://esbuild.github.io/analyze/
await writeFile(`stats/${fileName}.meta.json`, JSON.stringify(metafile));
@@ -48,13 +49,14 @@ const buildPackage = async (entryName: keyof typeof packageOptions) => {
};
const handler = (e) => {
+ // eslint-disable-next-line no-console
console.error(e);
process.exit(1);
};
const main = async () => {
await generateLangium();
- await mkdir('stats').catch(() => {});
+ await mkdir('stats', { recursive: true });
const packageNames = Object.keys(packageOptions) as (keyof typeof packageOptions)[];
// it should build `parser` before `mermaid` because it's a dependency
for (const pkg of packageNames) {
diff --git a/.esbuild/jisonPlugin.ts b/.esbuild/jisonPlugin.ts
index de801ea9f..007516f08 100644
--- a/.esbuild/jisonPlugin.ts
+++ b/.esbuild/jisonPlugin.ts
@@ -1,6 +1,6 @@
import { readFile } from 'node:fs/promises';
import { transformJison } from '../.build/jisonTransformer.js';
-import { Plugin } from 'esbuild';
+import type { Plugin } from 'esbuild';
export const jisonPlugin: Plugin = {
name: 'jison',
diff --git a/.esbuild/server.ts b/.esbuild/server.ts
index 9102c7de8..ef61ebec2 100644
--- a/.esbuild/server.ts
+++ b/.esbuild/server.ts
@@ -1,11 +1,12 @@
-import express from 'express';
-import type { NextFunction, Request, Response } from 'express';
-import cors from 'cors';
-import { getBuildConfig, defaultOptions } from './util.js';
-import { context } from 'esbuild';
+/* eslint-disable no-console */
import chokidar from 'chokidar';
-import { generateLangium } from '../.build/generateLangium.js';
+import cors from 'cors';
+import { context } from 'esbuild';
+import type { Request, Response } from 'express';
+import express from 'express';
import { packageOptions } from '../.build/common.js';
+import { generateLangium } from '../.build/generateLangium.js';
+import { defaultOptions, getBuildConfig } from './util.js';
const configs = Object.values(packageOptions).map(({ packageName }) =>
getBuildConfig({ ...defaultOptions, minify: false, core: false, entryName: packageName })
@@ -19,16 +20,28 @@ const mermaidIIFEConfig = getBuildConfig({
});
configs.push(mermaidIIFEConfig);
-const contexts = await Promise.all(configs.map((config) => context(config)));
+const contexts = await Promise.all(
+ configs.map(async (config) => ({ config, context: await context(config) }))
+);
+let rebuildCounter = 1;
const rebuildAll = async () => {
- console.time('Rebuild time');
- await Promise.all(contexts.map((ctx) => ctx.rebuild())).catch((e) => console.error(e));
- console.timeEnd('Rebuild time');
+ const buildNumber = rebuildCounter++;
+ const timeLabel = `Rebuild ${buildNumber} Time (total)`;
+ console.time(timeLabel);
+ await Promise.all(
+ contexts.map(async ({ config, context }) => {
+ const buildVariant = `Rebuild ${buildNumber} Time (${Object.keys(config.entryPoints!)[0]} ${config.format})`;
+ console.time(buildVariant);
+ await context.rebuild();
+ console.timeEnd(buildVariant);
+ })
+ ).catch((e) => console.error(e));
+ console.timeEnd(timeLabel);
};
let clients: { id: number; response: Response }[] = [];
-function eventsHandler(request: Request, response: Response, next: NextFunction) {
+function eventsHandler(request: Request, response: Response) {
const headers = {
'Content-Type': 'text/event-stream',
Connection: 'keep-alive',
@@ -45,19 +58,20 @@ function eventsHandler(request: Request, response: Response, next: NextFunction)
});
}
-let timeoutId: NodeJS.Timeout | undefined = undefined;
+let timeoutID: NodeJS.Timeout | undefined = undefined;
/**
* Debounce file change events to avoid rebuilding multiple times.
*/
function handleFileChange() {
- if (timeoutId !== undefined) {
- clearTimeout(timeoutId);
+ if (timeoutID !== undefined) {
+ clearTimeout(timeoutID);
}
- timeoutId = setTimeout(async () => {
+ // eslint-disable-next-line @typescript-eslint/no-misused-promises
+ timeoutID = setTimeout(async () => {
await rebuildAll();
sendEventsToAll();
- timeoutId = undefined;
+ timeoutID = undefined;
}, 100);
}
@@ -74,15 +88,16 @@ async function createServer() {
ignoreInitial: true,
ignored: [/node_modules/, /dist/, /docs/, /coverage/],
})
+ // eslint-disable-next-line @typescript-eslint/no-misused-promises
.on('all', async (event, path) => {
// Ignore other events.
if (!['add', 'change'].includes(event)) {
return;
}
- if (/\.langium$/.test(path)) {
+ console.log(`${path} changed. Rebuilding...`);
+ if (path.endsWith('.langium')) {
await generateLangium();
}
- console.log(`${path} changed. Rebuilding...`);
handleFileChange();
});
@@ -99,4 +114,4 @@ async function createServer() {
});
}
-createServer();
+void createServer();
diff --git a/.esbuild/util.ts b/.esbuild/util.ts
index 5c21cbf45..6d424ab17 100644
--- a/.esbuild/util.ts
+++ b/.esbuild/util.ts
@@ -56,7 +56,7 @@ export const getBuildConfig = (options: MermaidBuildOptions): BuildOptions => {
const external: string[] = ['require', 'fs', 'path'];
const { name, file, packageName } = packageOptions[entryName];
const outFileName = getFileName(name, options);
- let output: BuildOptions = buildOptions({
+ const output: BuildOptions = buildOptions({
absWorkingDir: resolve(__dirname, `../packages/${packageName}`),
entryPoints: {
[outFileName]: `src/${file}`,
diff --git a/.eslintignore b/.eslintignore
deleted file mode 120000
index 3e4e48b0b..000000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-.gitignore
\ No newline at end of file
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
deleted file mode 100644
index c9428c9f5..000000000
--- a/.eslintrc.cjs
+++ /dev/null
@@ -1,190 +0,0 @@
-module.exports = {
- env: {
- browser: true,
- es6: true,
- 'jest/globals': true,
- node: true,
- },
- root: true,
- parser: '@typescript-eslint/parser',
- parserOptions: {
- ecmaFeatures: {
- experimentalObjectRestSpread: true,
- jsx: true,
- },
- tsconfigRootDir: __dirname,
- sourceType: 'module',
- ecmaVersion: 2022,
- allowAutomaticSingleRunInference: true,
- project: ['./tsconfig.eslint.json', './packages/*/tsconfig.json'],
- parser: '@typescript-eslint/parser',
- },
- extends: [
- 'eslint:recommended',
- 'plugin:@typescript-eslint/recommended',
- 'plugin:json/recommended',
- 'plugin:markdown/recommended-legacy',
- 'plugin:@cspell/recommended',
- 'prettier',
- ],
- plugins: [
- '@typescript-eslint',
- 'no-only-tests',
- 'html',
- 'jest',
- 'jsdoc',
- 'json',
- '@cspell',
- 'lodash',
- 'unicorn',
- ],
- ignorePatterns: [
- // this file is automatically generated by `pnpm run --filter mermaid types:build-config`
- 'packages/mermaid/src/config.type.ts',
- ],
- rules: {
- curly: 'error',
- 'no-console': 'error',
- 'no-prototype-builtins': 'off',
- 'no-unused-vars': 'off',
- 'cypress/no-async-tests': 'off',
- '@typescript-eslint/consistent-type-imports': 'error',
- '@typescript-eslint/no-explicit-any': 'warn',
- '@typescript-eslint/no-floating-promises': 'error',
- '@typescript-eslint/no-misused-promises': 'error',
- '@typescript-eslint/no-unused-vars': 'warn',
- '@typescript-eslint/consistent-type-definitions': 'error',
- '@typescript-eslint/ban-ts-comment': [
- 'error',
- {
- 'ts-expect-error': 'allow-with-description',
- 'ts-ignore': 'allow-with-description',
- 'ts-nocheck': 'allow-with-description',
- 'ts-check': 'allow-with-description',
- minimumDescriptionLength: 10,
- },
- ],
- '@typescript-eslint/naming-convention': [
- 'error',
- {
- selector: 'typeLike',
- format: ['PascalCase'],
- custom: {
- regex: '^I[A-Z]',
- match: false,
- },
- },
- ],
- 'json/*': ['error', 'allowComments'],
- '@cspell/spellchecker': [
- 'error',
- {
- checkIdentifiers: true,
- checkStrings: true,
- checkStringTemplates: true,
- },
- ],
- 'no-empty': [
- 'error',
- {
- allowEmptyCatch: true,
- },
- ],
- 'no-only-tests/no-only-tests': 'error',
- 'lodash/import-scope': ['error', 'method'],
- 'unicorn/better-regex': 'error',
- 'unicorn/no-abusive-eslint-disable': 'error',
- 'unicorn/no-array-push-push': 'error',
- 'unicorn/no-for-loop': 'error',
- 'unicorn/no-instanceof-array': 'error',
- 'unicorn/no-typeof-undefined': 'error',
- 'unicorn/no-unnecessary-await': 'error',
- 'unicorn/no-unsafe-regex': 'warn',
- 'unicorn/no-useless-promise-resolve-reject': 'error',
- 'unicorn/prefer-array-find': 'error',
- 'unicorn/prefer-array-flat-map': 'error',
- 'unicorn/prefer-array-index-of': 'error',
- 'unicorn/prefer-array-some': 'error',
- 'unicorn/prefer-default-parameters': 'error',
- 'unicorn/prefer-includes': 'error',
- 'unicorn/prefer-negative-index': 'error',
- 'unicorn/prefer-object-from-entries': 'error',
- 'unicorn/prefer-string-starts-ends-with': 'error',
- 'unicorn/prefer-string-trim-start-end': 'error',
- 'unicorn/string-content': 'error',
- 'unicorn/prefer-spread': 'error',
- 'unicorn/no-lonely-if': 'error',
- },
- overrides: [
- {
- files: ['cypress/**', 'demos/**'],
- rules: {
- 'no-console': 'off',
- },
- },
- {
- files: ['*.{js,jsx,mjs,cjs}'],
- extends: ['plugin:jsdoc/recommended'],
- rules: {
- 'jsdoc/check-indentation': 'off',
- 'jsdoc/check-alignment': 'off',
- 'jsdoc/check-line-alignment': 'off',
- 'jsdoc/multiline-blocks': 'off',
- 'jsdoc/newline-after-description': 'off',
- 'jsdoc/tag-lines': 'off',
- 'jsdoc/require-param-description': 'off',
- 'jsdoc/require-param-type': 'off',
- 'jsdoc/require-returns': 'off',
- 'jsdoc/require-returns-description': 'off',
- },
- },
- {
- files: ['*.{ts,tsx}'],
- plugins: ['tsdoc'],
- rules: {
- 'no-restricted-syntax': [
- 'error',
- {
- selector: 'TSEnumDeclaration',
- message:
- 'Prefer using TypeScript union types over TypeScript enum, since TypeScript enums have a bunch of issues, see https://dev.to/dvddpl/whats-the-problem-with-typescript-enums-2okj',
- },
- ],
- 'tsdoc/syntax': 'error',
- },
- },
- {
- files: ['*.spec.{ts,js}', 'cypress/**', 'demos/**', '**/docs/**'],
- rules: {
- 'jsdoc/require-jsdoc': 'off',
- '@typescript-eslint/no-unused-vars': 'off',
- },
- },
- {
- files: ['*.spec.{ts,js}', 'tests/**', 'cypress/**/*.js'],
- rules: {
- '@cspell/spellchecker': [
- 'error',
- {
- checkIdentifiers: false,
- checkStrings: false,
- checkStringTemplates: false,
- },
- ],
- },
- },
- {
- files: ['*.html', '*.md', '**/*.md/*'],
- rules: {
- 'no-var': 'error',
- 'no-undef': 'off',
- '@typescript-eslint/no-unused-vars': 'off',
- '@typescript-eslint/no-floating-promises': 'off',
- '@typescript-eslint/no-misused-promises': 'off',
- },
- parserOptions: {
- project: null,
- },
- },
- ],
-};
diff --git a/.github/lychee.toml b/.github/lychee.toml
index c5a2f0e45..2e3b08c41 100644
--- a/.github/lychee.toml
+++ b/.github/lychee.toml
@@ -41,7 +41,10 @@ exclude = [
"https://bundlephobia.com",
# Chrome webstore migration issue. Temporary
-"https://chromewebstore.google.com"
+"https://chromewebstore.google.com",
+
+# Drupal 403
+"https://(www.)?drupal.org"
]
# Exclude all private IPs from checking.
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
index 87607bc2f..0ce778957 100644
--- a/.github/workflows/build-docs.yml
+++ b/.github/workflows/build-docs.yml
@@ -18,7 +18,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- - uses: pnpm/action-setup@v2
+ - uses: pnpm/action-setup@v4
- name: Setup Node.js
uses: actions/setup-node@v4
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bf54772bc..c6e96912e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- - uses: pnpm/action-setup@v2
+ - uses: pnpm/action-setup@v4
# uses version from "packageManager" field in package.json
- name: Setup Node.js
diff --git a/.github/workflows/e2e-applitools.yml b/.github/workflows/e2e-applitools.yml
index 1238fe371..5e5407a23 100644
--- a/.github/workflows/e2e-applitools.yml
+++ b/.github/workflows/e2e-applitools.yml
@@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v4
- - uses: pnpm/action-setup@v2
+ - uses: pnpm/action-setup@v4
# uses version from "packageManager" field in package.json
- name: Setup Node.js
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 6477c9eb5..2600b3fb8 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -1,9 +1,3 @@
-# We use github cache to save snapshots between runs.
-# For PRs and MergeQueues, the target commit is used, and for push events, github.event.previous is used.
-# If a snapshot for a given Hash is not found, we checkout that commit, run the tests and cache the snapshots.
-# These are then downloaded before running the E2E, providing the reference snapshots.
-# If there are any errors, the diff image is uploaded to artifacts, and the user is notified.
-
name: E2E
on:
@@ -30,6 +24,7 @@ env:
) ||
github.event.before
}}
+ shouldRunParallel: ${{ secrets.CYPRESS_RECORD_KEY != '' && !(github.event_name == 'push' && github.ref == 'refs/heads/develop') }}
jobs:
cache:
runs-on: ubuntu-latest
@@ -38,7 +33,7 @@ jobs:
options: --user 1001
steps:
- uses: actions/checkout@v4
- - uses: pnpm/action-setup@v2
+ - uses: pnpm/action-setup@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
@@ -72,16 +67,6 @@ jobs:
mkdir -p cypress/snapshots/stats/base
mv stats cypress/snapshots/stats/base
- - name: Cypress run
- uses: cypress-io/github-action@v6
- id: cypress-snapshot-gen
- if: ${{ steps.cache-snapshot.outputs.cache-hit != 'true' }}
- with:
- install: false
- start: pnpm run dev
- wait-on: 'http://localhost:9000'
- browser: chrome
-
e2e:
runs-on: ubuntu-latest
container:
@@ -95,7 +80,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- - uses: pnpm/action-setup@v2
+ - uses: pnpm/action-setup@v4
# uses version from "packageManager" field in package.json
- name: Setup Node.js
@@ -132,7 +117,7 @@ jobs:
id: cypress
# If CYPRESS_RECORD_KEY is set, run in parallel on all containers
# Otherwise (e.g. if running from fork), we run on a single container only
- if: ${{ ( env.CYPRESS_RECORD_KEY != '' ) || ( matrix.containers == 1 ) }}
+ if: ${{ env.shouldRunParallel == 'true' || ( matrix.containers == 1 ) }}
with:
install: false
start: pnpm run dev:coverage
@@ -140,12 +125,16 @@ jobs:
browser: chrome
# Disable recording if we don't have an API key
# e.g. if this action was run from a fork
- record: ${{ secrets.CYPRESS_RECORD_KEY != '' }}
- parallel: ${{ secrets.CYPRESS_RECORD_KEY != '' }}
+ record: ${{ env.shouldRunParallel == 'true' }}
+ parallel: ${{ env.shouldRunParallel == 'true' }}
env:
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
VITEST_COVERAGE: true
CYPRESS_COMMIT: ${{ github.sha }}
+ ARGOS_TOKEN: ${{ secrets.ARGOS_TOKEN }}
+ ARGOS_PARALLEL: ${{ env.shouldRunParallel == 'true' }}
+ ARGOS_PARALLEL_TOTAL: 4
+ ARGOS_PARALLEL_INDEX: ${{ matrix.containers }}
- name: Upload Coverage to Codecov
uses: codecov/codecov-action@v4
@@ -158,55 +147,3 @@ jobs:
fail_ci_if_error: false
verbose: true
token: 6845cc80-77ee-4e17-85a1-026cd95e0766
-
- # We upload the artifacts into numbered archives to prevent overwriting
- - name: Upload Artifacts
- uses: actions/upload-artifact@v4
- if: ${{ always() }}
- with:
- name: snapshots-${{ matrix.containers }}
- retention-days: 1
- path: ./cypress/snapshots
-
- combineArtifacts:
- needs: e2e
- runs-on: ubuntu-latest
- if: ${{ always() }}
- steps:
- # Download all snapshot artifacts and merge them into a single folder
- - name: Download All Artifacts
- uses: actions/download-artifact@v4
- with:
- path: snapshots
- pattern: snapshots-*
- merge-multiple: true
-
- # For successful push events, we save the snapshots cache
- - name: Save snapshots cache
- id: cache-upload
- if: ${{ github.event_name == 'push' && needs.e2e.result != 'failure' }}
- uses: actions/cache/save@v4
- with:
- path: ./snapshots
- key: ${{ runner.os }}-snapshots-${{ github.event.after }}
-
- - name: Flatten images to a folder
- if: ${{ needs.e2e.result == 'failure' }}
- run: |
- mkdir errors
- cd snapshots
- find . -mindepth 2 -type d -name "*__diff_output__*" -exec sh -c 'mv "$0"/*.png ../errors/' {} \;
-
- - name: Upload Error snapshots
- if: ${{ needs.e2e.result == 'failure' }}
- uses: actions/upload-artifact@v4
- id: upload-artifacts
- with:
- name: error-snapshots
- retention-days: 10
- path: errors/
-
- - name: Notify Users
- if: ${{ needs.e2e.result == 'failure' }}
- run: |
- echo "::error title=Visual tests failed::You can view images that failed by downloading the error-snapshots artifact: ${{ steps.upload-artifacts.outputs.artifact-url }}"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8f5995d71..ac34067f6 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -19,7 +19,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- - uses: pnpm/action-setup@v2
+ - uses: pnpm/action-setup@v4
# uses version from "packageManager" field in package.json
- name: Setup Node.js
diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
index fb70a90ec..4ff5f4117 100644
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -25,7 +25,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- - uses: pnpm/action-setup@v2
+ - uses: pnpm/action-setup@v4
- name: Setup Node.js
uses: actions/setup-node@v4
diff --git a/.github/workflows/release-preview-publish.yml b/.github/workflows/release-preview-publish.yml
index c763430b0..91e3ac981 100644
--- a/.github/workflows/release-preview-publish.yml
+++ b/.github/workflows/release-preview-publish.yml
@@ -13,7 +13,7 @@ jobs:
with:
fetch-depth: 0
- - uses: pnpm/action-setup@v2
+ - uses: pnpm/action-setup@v4
- name: Setup Node.js
uses: actions/setup-node@v4
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index dce461cf5..4dcf709c0 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v4
- uses: fregante/setup-git-user@v2
- - uses: pnpm/action-setup@v2
+ - uses: pnpm/action-setup@v4
# uses version from "packageManager" field in package.json
- name: Setup Node.js
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a4bd264e0..a0b284a68 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- - uses: pnpm/action-setup@v2
+ - uses: pnpm/action-setup@v4
# uses version from "packageManager" field in package.json
- name: Setup Node.js
diff --git a/.github/workflows/update-browserlist.yml b/.github/workflows/update-browserlist.yml
index 9aac3d7b3..f8f7696cd 100644
--- a/.github/workflows/update-browserlist.yml
+++ b/.github/workflows/update-browserlist.yml
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- - uses: pnpm/action-setup@v2
+ - uses: pnpm/action-setup@v4
- run: npx update-browserslist-db@latest
- name: Commit changes
uses: EndBug/add-and-commit@v9
diff --git a/.gitignore b/.gitignore
index a0fd1c50b..7948faee4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@ demos/dev/**
!/demos/dev/example.html
!/demos/dev/reload.js
tsx-0/**
+vite.config.ts.timestamp-*
# autogenereated by langium-cli
-generated/
\ No newline at end of file
+generated/
diff --git a/.vite/build.ts b/.vite/build.ts
index 7ce93a497..486d59452 100644
--- a/.vite/build.ts
+++ b/.vite/build.ts
@@ -1,4 +1,5 @@
-import { build, InlineConfig, type PluginOption } from 'vite';
+import type { InlineConfig } from 'vite';
+import { build, type PluginOption } from 'vite';
import { resolve } from 'path';
import { fileURLToPath } from 'url';
import jisonPlugin from './jisonPlugin.js';
@@ -46,9 +47,10 @@ interface BuildOptions {
export const getBuildConfig = ({ minify, core, watch, entryName }: BuildOptions): InlineConfig => {
const external: (string | RegExp)[] = ['require', 'fs', 'path'];
+ // eslint-disable-next-line no-console
console.log(entryName, packageOptions[entryName]);
const { name, file, packageName } = packageOptions[entryName];
- let output: OutputOptions = [
+ const output: OutputOptions = [
{
name,
format: 'esm',
@@ -83,7 +85,6 @@ export const getBuildConfig = ({ minify, core, watch, entryName }: BuildOptions)
plugins: [
jisonPlugin(),
jsonSchemaPlugin(), // handles `.schema.yaml` files
- // @ts-expect-error According to the type definitions, rollup plugins are incompatible with vite
typescript({ compilerOptions: { declaration: false } }),
istanbul({
exclude: ['node_modules', 'test/', '__mocks__', 'generated'],
@@ -121,10 +122,10 @@ await generateLangium();
if (watch) {
await build(getBuildConfig({ minify: false, watch, core: false, entryName: 'parser' }));
- build(getBuildConfig({ minify: false, watch, core: false, entryName: 'mermaid' }));
+ void build(getBuildConfig({ minify: false, watch, core: false, entryName: 'mermaid' }));
if (!mermaidOnly) {
- build(getBuildConfig({ minify: false, watch, entryName: 'mermaid-example-diagram' }));
- build(getBuildConfig({ minify: false, watch, entryName: 'mermaid-zenuml' }));
+ void build(getBuildConfig({ minify: false, watch, entryName: 'mermaid-example-diagram' }));
+ void build(getBuildConfig({ minify: false, watch, entryName: 'mermaid-zenuml' }));
}
} else if (visualize) {
await build(getBuildConfig({ minify: false, watch, core: false, entryName: 'parser' }));
diff --git a/.vite/jsonSchemaPlugin.ts b/.vite/jsonSchemaPlugin.ts
index 2e5b5cc0b..3614d5b45 100644
--- a/.vite/jsonSchemaPlugin.ts
+++ b/.vite/jsonSchemaPlugin.ts
@@ -1,4 +1,4 @@
-import { PluginOption } from 'vite';
+import type { PluginOption } from 'vite';
import { getDefaults, getSchema, loadSchema } from '../.build/jsonSchema.js';
/**
diff --git a/.vite/server.ts b/.vite/server.ts
index 99d16f6f2..078599dc1 100644
--- a/.vite/server.ts
+++ b/.vite/server.ts
@@ -23,8 +23,9 @@ async function createServer() {
app.use(express.static('cypress/platform'));
app.listen(9000, () => {
+ // eslint-disable-next-line no-console
console.log(`Listening on http://localhost:9000`);
});
}
-createServer();
+void createServer();
diff --git a/FUNDING.json b/FUNDING.json
new file mode 100644
index 000000000..a1df876f4
--- /dev/null
+++ b/FUNDING.json
@@ -0,0 +1,7 @@
+{
+ "drips": {
+ "ethereum": {
+ "ownedBy": "0x0831DDFe60d009d9448CC976157b539089aB821E"
+ }
+ }
+}
diff --git a/README.md b/README.md
index d368a4349..8d5eebfeb 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,7 @@ Try Live Editor previews of future releases: Bold text! )`;
-if (location.href.match('test-html-escaping')) {
+if (/test-html-escaping/.exec(location.href)) {
code = code3;
}
diff --git a/cypress/platform/viewer.js b/cypress/platform/viewer.js
index 482a90646..c397f0e16 100644
--- a/cypress/platform/viewer.js
+++ b/cypress/platform/viewer.js
@@ -132,7 +132,7 @@ if (typeof document !== 'undefined') {
window.addEventListener(
'load',
function () {
- if (this.location.href.match('xss.html')) {
+ if (/xss.html/.exec(this.location.href)) {
this.console.log('Using api');
void contentLoadedApi().finally(markRendered);
} else {
diff --git a/cypress/platform/xss25.html b/cypress/platform/xss25.html
new file mode 100644
index 000000000..251e1ec23
--- /dev/null
+++ b/cypress/platform/xss25.html
@@ -0,0 +1,108 @@
+
+
+ Security check
+
+
+
+
diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js
index ef985866e..aa888465b 100644
--- a/cypress/support/e2e.js
+++ b/cypress/support/e2e.js
@@ -15,6 +15,7 @@
import '@cypress/code-coverage/support';
import '@applitools/eyes-cypress/commands';
+import '@argos-ci/cypress/support';
// Import commands.js using ES2015 syntax:
import './commands';
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
index baa9a7217..b01ce9bac 100644
--- a/cypress/tsconfig.json
+++ b/cypress/tsconfig.json
@@ -2,7 +2,7 @@
"compilerOptions": {
"target": "es2020",
"lib": ["es2020", "dom"],
- "types": ["cypress", "node"],
+ "types": ["cypress", "node", "@argos-ci/cypress/dist/support.d.ts"],
"allowImportingTsExtensions": true,
"noEmit": true
},
diff --git a/demos/sequence.html b/demos/sequence.html
index abdc84f04..eca935ff5 100644
--- a/demos/sequence.html
+++ b/demos/sequence.html
@@ -238,6 +238,17 @@
Alice-xJohn: Hello John, how are you?
John--xAlice: Great!
+
+
+ sequenceDiagram
+ participant Alice
+ participant Bob
+ Alice<<->>Bob: Hello!
+ Alice<<->>Bob: Wow, we said that at the same time!
+ Bob<<-->>Alice: Bidirectional Arrows are so cool
+
@@ -913,7 +913,7 @@ flowchart LR
> **Success** The tooltip functionality and the ability to link to urls are available from version 0.5.2.
-?> Due to limitations with how Docsify handles JavaScript callback functions, an alternate working demo for the above code can be viewed at [this jsfiddle](https://jsfiddle.net/Ogglas/2o73vdez/7).
+?> Due to limitations with how Docsify handles JavaScript callback functions, an alternate working demo for the above code can be viewed at [this jsfiddle](https://jsfiddle.net/yk4h7qou/2/).
Links are opened in the same browser tab/window by default. It is possible to change this by adding a link target to the click definition (`_self`, `_blank`, `_parent` and `_top` are supported):
@@ -957,7 +957,7 @@ Beginner's tip—a full example using interactive links in a html context:
'
);
let states = stateDb.getStates();
- expect(states[testStateId].descriptions[0]).toEqual('desc outside the script ');
+ expect(states.get(testStateId).descriptions[0]).toEqual('desc outside the script ');
});
it('adds the description to the state with the given id', () => {
stateDb.addDescription(testStateId, 'the description');
let states = stateDb.getStates();
- expect(states[testStateId].descriptions[0]).toEqual('the description');
+ expect(states.get(testStateId).descriptions[0]).toEqual('the description');
});
});
});
diff --git a/packages/mermaid/src/diagrams/state/stateDiagram-v2.spec.js b/packages/mermaid/src/diagrams/state/stateDiagram-v2.spec.js
index c387ff7b3..53063f41a 100644
--- a/packages/mermaid/src/diagrams/state/stateDiagram-v2.spec.js
+++ b/packages/mermaid/src/diagrams/state/stateDiagram-v2.spec.js
@@ -405,7 +405,7 @@ describe('state diagram V2, ', function () {
stateDiagram.parser.yy.extract(stateDiagram.parser.yy.getRootDocV2());
const states = stateDb.getStates();
- expect(states['Active'].doc[0].id).toEqual('Idle');
+ expect(states.get('Active').doc[0].id).toEqual('Idle');
const rels = stateDb.getRelations();
const rel_Inactive_Idle = rels.find((rel) => rel.id1 === 'Inactive' && rel.id2 === 'Idle');
diff --git a/packages/mermaid/src/diagrams/state/stateRenderer-v2.js b/packages/mermaid/src/diagrams/state/stateRenderer-v2.js
index 482e37cae..acb10427b 100644
--- a/packages/mermaid/src/diagrams/state/stateRenderer-v2.js
+++ b/packages/mermaid/src/diagrams/state/stateRenderer-v2.js
@@ -5,7 +5,7 @@ import { render } from '../../dagre-wrapper/index.js';
import { log } from '../../logger.js';
import { configureSvgSize } from '../../setupGraphViewbox.js';
import common from '../common/common.js';
-import utils from '../../utils.js';
+import utils, { getEdgeId } from '../../utils.js';
import {
DEFAULT_DIAGRAM_DIRECTION,
@@ -81,7 +81,7 @@ export const setConf = function (cnf) {
*
* @param {string} text - the diagram text to be parsed
* @param diagramObj
- * @returns {Record} ClassDef styles (a Map with keys = strings, values = )
+ * @returns {Map} ClassDef styles (a Map with keys = strings, values = )
*/
export const getClasses = function (text, diagramObj) {
diagramObj.db.extract(diagramObj.db.getRootDocV2());
@@ -129,13 +129,13 @@ export function stateDomId(itemId = '', counter = 0, type = '', typeSpacer = DOM
* @param g - graph
* @param {object} parent
* @param {object} parsedItem - parsed statement item
- * @param {object[]} diagramStates - the list of all known states for the diagram
+ * @param {Map} diagramStates - the list of all known states for the diagram
* @param {object} diagramDb
* @param {boolean} altFlag - for clusters, add the "statediagram-cluster-alt" CSS class
*/
const setupNode = (g, parent, parsedItem, diagramStates, diagramDb, altFlag) => {
const itemId = parsedItem.id;
- const classStr = getClassesFromDbInfo(diagramStates[itemId]);
+ const classStr = getClassesFromDbInfo(diagramStates.get(itemId));
if (itemId !== 'root') {
let shape = SHAPE_STATE;
@@ -252,7 +252,6 @@ const setupNode = (g, parent, parsedItem, diagramStates, diagramDb, altFlag) =>
type: 'group',
padding: 0, //getConfig().flowchart.padding
};
- graphItemCount++;
const parentNodeId = itemId + PARENT_ID;
g.setNode(parentNodeId, groupData);
@@ -270,17 +269,23 @@ const setupNode = (g, parent, parsedItem, diagramStates, diagramDb, altFlag) =>
from = noteData.id;
to = itemId;
}
+
g.setEdge(from, to, {
arrowhead: 'none',
arrowType: '',
style: G_EDGE_STYLE,
labelStyle: '',
+ id: getEdgeId(from, to, {
+ counter: graphItemCount,
+ }),
classes: CSS_EDGE_NOTE_EDGE,
arrowheadStyle: G_EDGE_ARROWHEADSTYLE,
labelpos: G_EDGE_LABELPOS,
labelType: G_EDGE_LABELTYPE,
thickness: G_EDGE_THICKNESS,
});
+
+ graphItemCount++;
} else {
g.setNode(itemId, nodeData);
}
@@ -303,7 +308,7 @@ const setupNode = (g, parent, parsedItem, diagramStates, diagramDb, altFlag) =>
* @param g
* @param parentParsedItem - parsed Item that is the parent of this document (doc)
* @param doc - the document to set up; it is a list of parsed statements
- * @param {object[]} diagramStates - the list of all known states for the diagram
+ * @param {Map} diagramStates - the list of all known states for the diagram
* @param diagramDb
* @param {boolean} altFlag
* @todo This duplicates some of what is done in stateDb.js extract method
@@ -324,7 +329,9 @@ const setupDoc = (g, parentParsedItem, doc, diagramStates, diagramDb, altFlag) =
setupNode(g, parentParsedItem, item.state1, diagramStates, diagramDb, altFlag);
setupNode(g, parentParsedItem, item.state2, diagramStates, diagramDb, altFlag);
const edgeData = {
- id: 'edge' + graphItemCount,
+ id: getEdgeId(item.state1.id, item.state2.id, {
+ counter: graphItemCount,
+ }),
arrowhead: 'normal',
arrowTypeEnd: 'arrow_barb',
style: G_EDGE_STYLE,
@@ -355,8 +362,7 @@ const setupDoc = (g, parentParsedItem, doc, diagramStates, diagramDb, altFlag) =
const getDir = (parsedItem, defaultDir = DEFAULT_NESTED_DOC_DIR) => {
let dir = defaultDir;
if (parsedItem.doc) {
- for (let i = 0; i < parsedItem.doc.length; i++) {
- const parsedItemDoc = parsedItem.doc[i];
+ for (const parsedItemDoc of parsedItem.doc) {
if (parsedItemDoc.stmt === 'dir') {
dir = parsedItemDoc.value;
}
diff --git a/packages/mermaid/src/diagrams/timeline/svgDraw.js b/packages/mermaid/src/diagrams/timeline/svgDraw.js
index 874ac62ef..723dc46f1 100644
--- a/packages/mermaid/src/diagrams/timeline/svgDraw.js
+++ b/packages/mermaid/src/diagrams/timeline/svgDraw.js
@@ -258,24 +258,6 @@ export const drawTask = function (elem, task, conf) {
rect.ry = 3;
drawRect(g, rect);
- let xPos = task.x + 14;
- // task.people.forEach((person) => {
- // const colour = task.actors[person].color;
-
- // const circle = {
- // cx: xPos,
- // cy: task.y,
- // r: 7,
- // fill: colour,
- // stroke: '#000',
- // title: person,
- // pos: task.actors[person].position,
- // };
-
- // drawCircle(g, circle);
- // xPos += 10;
- // });
-
_drawTextCandidateFunc(conf)(
task.task,
g,
@@ -533,8 +515,7 @@ export const drawNode = function (elem, node, fullSection, conf) {
.attr('text-anchor', 'middle')
.call(wrap, node.width);
const bbox = txt.node().getBBox();
- const fontSize =
- conf.fontSize && conf.fontSize.replace ? conf.fontSize.replace('px', '') : conf.fontSize;
+ const fontSize = conf.fontSize?.replace ? conf.fontSize.replace('px', '') : conf.fontSize;
node.height = bbox.height + fontSize * 1.1 * 0.5 + node.padding;
node.height = Math.max(node.height, node.maxHeight);
node.width = node.width + 2 * node.padding;
@@ -558,8 +539,7 @@ export const getVirtualNodeHeight = function (elem, node, conf) {
.attr('text-anchor', 'middle')
.call(wrap, node.width);
const bbox = txt.node().getBBox();
- const fontSize =
- conf.fontSize && conf.fontSize.replace ? conf.fontSize.replace('px', '') : conf.fontSize;
+ const fontSize = conf.fontSize?.replace ? conf.fontSize.replace('px', '') : conf.fontSize;
textElem.remove();
return bbox.height + fontSize * 1.1 * 0.5 + node.padding;
};
diff --git a/packages/mermaid/src/diagrams/timeline/timelineRenderer.ts b/packages/mermaid/src/diagrams/timeline/timelineRenderer.ts
index 2f1f15689..b3405bc1b 100644
--- a/packages/mermaid/src/diagrams/timeline/timelineRenderer.ts
+++ b/packages/mermaid/src/diagrams/timeline/timelineRenderer.ts
@@ -115,8 +115,7 @@ export const draw = function (text: string, id: string, version: string, diagObj
maxEventCount = Math.max(maxEventCount, task.events.length);
//calculate maxEventLineLength
let maxEventLineLengthTemp = 0;
- for (let j = 0; j < task.events.length; j++) {
- const event = task.events[j];
+ for (const event of task.events) {
const eventNode = {
descr: event,
section: task.section,
diff --git a/packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/bandAxis.ts b/packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/bandAxis.ts
index 864ef1316..98eb31235 100644
--- a/packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/bandAxis.ts
+++ b/packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/bandAxis.ts
@@ -40,6 +40,6 @@ export class BandAxis extends BaseAxis {
}
getScaleValue(value: string): number {
- return this.scale(value) || this.getRange()[0];
+ return this.scale(value) ?? this.getRange()[0];
}
}
diff --git a/packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/baseAxis.ts b/packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/baseAxis.ts
index c3240a4a7..ef60cc85f 100644
--- a/packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/baseAxis.ts
+++ b/packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/baseAxis.ts
@@ -58,7 +58,7 @@ export abstract class BaseAxis implements Axis {
abstract recalculateScale(): void;
- abstract getTickValues(): Array;
+ abstract getTickValues(): (string | number)[];
getTickDistance(): number {
const range = this.getRange();
diff --git a/packages/mermaid/src/diagrams/xychart/xychartDb.ts b/packages/mermaid/src/diagrams/xychart/xychartDb.ts
index 637477f28..23b90724c 100644
--- a/packages/mermaid/src/diagrams/xychart/xychartDb.ts
+++ b/packages/mermaid/src/diagrams/xychart/xychartDb.ts
@@ -143,7 +143,7 @@ function transformDataWithoutCategory(data: number[]): SimplePlotDataType {
if (isLinearAxisData(xyChartData.xAxis)) {
const min = xyChartData.xAxis.min;
const max = xyChartData.xAxis.max;
- const step = (max - min + 1) / data.length;
+ const step = (max - min) / (data.length - 1);
const categories: string[] = [];
for (let i = min; i <= max; i += step) {
categories.push(`${i}`);
diff --git a/packages/mermaid/src/docs/.vitepress/config.ts b/packages/mermaid/src/docs/.vitepress/config.ts
index d937daf63..940fc6940 100644
--- a/packages/mermaid/src/docs/.vitepress/config.ts
+++ b/packages/mermaid/src/docs/.vitepress/config.ts
@@ -1,4 +1,5 @@
-import { defineConfig, MarkdownOptions } from 'vitepress';
+import type { MarkdownOptions } from 'vitepress';
+import { defineConfig } from 'vitepress';
import { version } from '../../../package.json';
import MermaidExample from './mermaid-markdown-all.js';
@@ -8,8 +9,9 @@ const allMarkdownTransformers: MarkdownOptions = {
light: 'github-light',
dark: 'github-dark',
},
- config: async (md) => {
- await MermaidExample(md);
+
+ config: (md) => {
+ MermaidExample(md);
},
};
@@ -150,9 +152,9 @@ function sidebarSyntax() {
{ text: 'C4 Diagram 🦺⚠️', link: '/syntax/c4' },
{ text: 'Mindmaps', link: '/syntax/mindmap' },
{ text: 'Timeline', link: '/syntax/timeline' },
- { text: 'Zenuml', link: '/syntax/zenuml' },
+ { text: 'ZenUML', link: '/syntax/zenuml' },
{ text: 'Sankey 🔥', link: '/syntax/sankey' },
- { text: 'XYChart 🔥', link: '/syntax/xyChart' },
+ { text: 'XY Chart 🔥', link: '/syntax/xyChart' },
{ text: 'Block Diagram 🔥', link: '/syntax/block' },
{ text: 'Packet 🔥', link: '/syntax/packet' },
{ text: 'Other Examples', link: '/syntax/examples' },
@@ -228,8 +230,6 @@ function sidebarNews() {
/**
* Return a string that puts together the pagePage, a '#', then the given id
- * @param pagePath
- * @param id
* @returns the fully formed path
*/
function pathToId(pagePath: string, id = ''): string {
diff --git a/packages/mermaid/src/docs/.vitepress/contributors.ts b/packages/mermaid/src/docs/.vitepress/contributors.ts
index 93eeee2e2..e61cf57e8 100644
--- a/packages/mermaid/src/docs/.vitepress/contributors.ts
+++ b/packages/mermaid/src/docs/.vitepress/contributors.ts
@@ -1,5 +1,6 @@
import contributorUsernamesJson from './contributor-names.json';
-import { CoreTeam, knut, plainTeamMembers } from './teamMembers.js';
+import type { CoreTeam } from './teamMembers.js';
+import { knut, plainTeamMembers } from './teamMembers.js';
const contributorUsernames: string[] = contributorUsernamesJson;
diff --git a/packages/mermaid/src/docs/.vitepress/mermaid-markdown-all.ts b/packages/mermaid/src/docs/.vitepress/mermaid-markdown-all.ts
index 64a069b4c..d1aeee5ac 100644
--- a/packages/mermaid/src/docs/.vitepress/mermaid-markdown-all.ts
+++ b/packages/mermaid/src/docs/.vitepress/mermaid-markdown-all.ts
@@ -1,6 +1,6 @@
import type { MarkdownRenderer } from 'vitepress';
-const MermaidExample = async (md: MarkdownRenderer) => {
+const MermaidExample = (md: MarkdownRenderer) => {
const defaultRenderer = md.renderer.rules.fence;
if (!defaultRenderer) {
diff --git a/packages/mermaid/src/docs/.vitepress/scripts/fetch-avatars.ts b/packages/mermaid/src/docs/.vitepress/scripts/fetch-avatars.ts
index cd78be782..23c359444 100644
--- a/packages/mermaid/src/docs/.vitepress/scripts/fetch-avatars.ts
+++ b/packages/mermaid/src/docs/.vitepress/scripts/fetch-avatars.ts
@@ -32,11 +32,11 @@ async function fetchAvatars() {
});
contributors = JSON.parse(await readFile(pathContributors, { encoding: 'utf-8' }));
- let avatars = contributors.map((name) => {
- download(`https://github.com/${name}.png?size=100`, getAvatarPath(name));
- });
+ const avatars = contributors.map((name) =>
+ download(`https://github.com/${name}.png?size=100`, getAvatarPath(name))
+ );
await Promise.allSettled(avatars);
}
-fetchAvatars();
+void fetchAvatars();
diff --git a/packages/mermaid/src/docs/.vitepress/scripts/fetch-contributors.ts b/packages/mermaid/src/docs/.vitepress/scripts/fetch-contributors.ts
index da7621b29..54144cf62 100644
--- a/packages/mermaid/src/docs/.vitepress/scripts/fetch-contributors.ts
+++ b/packages/mermaid/src/docs/.vitepress/scripts/fetch-contributors.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
// Adapted from https://github.dev/vitest-dev/vitest/blob/991ff33ab717caee85ef6cbe1c16dc514186b4cc/scripts/update-contributors.ts#L6
import { writeFile } from 'node:fs/promises';
diff --git a/packages/mermaid/src/docs/.vitepress/teamMembers.ts b/packages/mermaid/src/docs/.vitepress/teamMembers.ts
index d95f49ed8..e307b81c4 100644
--- a/packages/mermaid/src/docs/.vitepress/teamMembers.ts
+++ b/packages/mermaid/src/docs/.vitepress/teamMembers.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @cspell/spellchecker */
export interface Contributor {
name: string;
avatar: string;
diff --git a/packages/mermaid/src/docs/.vitepress/theme/index.ts b/packages/mermaid/src/docs/.vitepress/theme/index.ts
index 3ebb7614a..3ce3aea23 100644
--- a/packages/mermaid/src/docs/.vitepress/theme/index.ts
+++ b/packages/mermaid/src/docs/.vitepress/theme/index.ts
@@ -1,14 +1,16 @@
+/* eslint-disable no-console */
import DefaultTheme from 'vitepress/theme';
import './custom.css';
-// @ts-ignore
+// @ts-ignore Type not available
import Mermaid from './Mermaid.vue';
-// @ts-ignore
+// @ts-ignore Type not available
import Contributors from '../components/Contributors.vue';
-// @ts-ignore
+// @ts-ignore Type not available
import HomePage from '../components/HomePage.vue';
-// @ts-ignore
+// @ts-ignore Type not available
import TopBar from '../components/TopBar.vue';
import { getRedirect } from './redirect.js';
+// @ts-ignore Type not available
import { h } from 'vue';
import Theme from 'vitepress/theme';
import '../style/main.css';
@@ -33,7 +35,7 @@ export default {
const url = new URL(window.location.origin + to);
const newPath = getRedirect(url);
if (newPath) {
- console.log(`Redirecting to ${newPath} from ${window.location}`);
+ console.log(`Redirecting to ${newPath} from ${window.location.toString()}`);
// router.go isn't loading the ID properly.
window.location.href = `/${newPath}`;
}
diff --git a/packages/mermaid/src/docs/.vitepress/theme/redirect.ts b/packages/mermaid/src/docs/.vitepress/theme/redirect.ts
index 1b04e01d5..8283951ac 100644
--- a/packages/mermaid/src/docs/.vitepress/theme/redirect.ts
+++ b/packages/mermaid/src/docs/.vitepress/theme/redirect.ts
@@ -116,3 +116,5 @@ export const getRedirect = (url: URL): string | undefined => {
return `${idRedirectMap[path]}.html${id ? `#${id}` : ''}`;
}
};
+
+// cspell:ignore mermaidapi, breakingchanges, classdiagram, entityrelationshipdiagram, mermaidapi, mermaidcli, gettingstarted, syntaxreference, newdiagram, requirementdiagram, sequencediagram
diff --git a/packages/mermaid/src/docs/community/contributing.md b/packages/mermaid/src/docs/community/contributing.md
index 195146a61..71048d095 100644
--- a/packages/mermaid/src/docs/community/contributing.md
+++ b/packages/mermaid/src/docs/community/contributing.md
@@ -52,7 +52,7 @@ The following commands must be sufficient enough to start with:
```bash
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.
diff --git a/packages/mermaid/src/docs/config/img/mathMLDifferences.png b/packages/mermaid/src/docs/config/img/mathMLDifferences.png
new file mode 100644
index 000000000..6b7a86400
Binary files /dev/null and b/packages/mermaid/src/docs/config/img/mathMLDifferences.png differ
diff --git a/packages/mermaid/src/docs/config/math.md b/packages/mermaid/src/docs/config/math.md
index 22b398e08..a53dceaf2 100644
--- a/packages/mermaid/src/docs/config/math.md
+++ b/packages/mermaid/src/docs/config/math.md
@@ -60,3 +60,13 @@ Example with legacy mode enabled (the latest version of KaTeX's stylesheet can b
](https://www.npmjs.com/package/mermaid)
[](https://discord.gg/AgrbSrBer3)
[](https://twitter.com/mermaidjs_)
+[](https://argos-ci.com)
<img src=){kind=link}