marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-19 23:39:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix-node16-module-resolution

Browse Source
This commit is contained in:
Remco Haszing
2023-03-17 20:25:35 +01:00
parent fc80ba66d2 7647ae317a
commit f3bebf25ea
8 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docs/config/setup/modules/mermaidAPI.md
View File

@@ -95,7 +95,7 @@ mermaid.initialize(config);
#### Defined in #### Defined in
[mermaidAPI.ts:662](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L662) [mermaidAPI.ts:659](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L659)
## Functions ## Functions
@@ -126,7 +126,7 @@ Return the last node appended
#### Defined in #### Defined in
[mermaidAPI.ts:308](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L308) [mermaidAPI.ts:305](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L305)
--- ---
@@ -152,7 +152,7 @@ the cleaned up svgCode
#### Defined in #### Defined in
[mermaidAPI.ts:259](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L259) [mermaidAPI.ts:256](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L256)
--- ---
@@ -201,7 +201,7 @@ the string with all the user styles
#### Defined in #### Defined in
[mermaidAPI.ts:236](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L236) [mermaidAPI.ts:233](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L233)
--- ---
@@ -294,7 +294,7 @@ Put the svgCode into an iFrame. Return the iFrame code
#### Defined in #### Defined in
[mermaidAPI.ts:287](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L287) [mermaidAPI.ts:284](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L284)
--- ---
@@ -319,4 +319,4 @@ Remove any existing elements from the given document
#### Defined in #### Defined in
[mermaidAPI.ts:358](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L358) [mermaidAPI.ts:355](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L355)

2
docs/syntax/mindmap.md
View File

@@ -224,7 +224,7 @@ mindmap
C C
``` ```
_These classes needs top be supplied by the site administrator._ _These classes need to be supplied by the site administrator._
## Unclear indentation ## Unclear indentation

4
package.json
View File

@@ -4,7 +4,7 @@
"version": "10.0.2", "version": "10.0.2",
"description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.", "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
"type": "module", "type": "module",
"packageManager": "pnpm@7.29.0", "packageManager": "pnpm@7.29.1",
"keywords": [ "keywords": [
"diagram", "diagram",
"markdown", "markdown",
@@ -113,6 +113,6 @@
"vitest": "^0.29.0" "vitest": "^0.29.0"
}, },
"volta": { "volta": {
"node": "18.14.2" "node": "18.15.0"
} }
} }

4
packages/mermaid/package.json
View File

@@ -57,7 +57,7 @@
"cytoscape-cose-bilkent": "^4.1.0", "cytoscape-cose-bilkent": "^4.1.0",
"cytoscape-fcose": "^2.1.0", "cytoscape-fcose": "^2.1.0",
"d3": "^7.4.0", "d3": "^7.4.0",
"dagre-d3-es": "7.0.9", "dagre-d3-es": "7.0.10",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
"dompurify": "2.4.5", "dompurify": "2.4.5",
"elkjs": "^0.8.2", "elkjs": "^0.8.2",
@@ -74,7 +74,7 @@
"@types/d3": "^7.4.0", "@types/d3": "^7.4.0",
"@types/dompurify": "^2.4.0", "@types/dompurify": "^2.4.0",
"@types/jsdom": "^21.0.0", "@types/jsdom": "^21.0.0",
"@types/lodash-es": "^4.17.6", "@types/lodash-es": "^4.17.7",
"@types/micromatch": "^4.0.2", "@types/micromatch": "^4.0.2",
"@types/prettier": "^2.7.1", "@types/prettier": "^2.7.1",
"@types/stylis": "^4.0.2", "@types/stylis": "^4.0.2",

1
packages/mermaid/src/accessibility.ts
View File

@@ -28,7 +28,6 @@ const SVG_ROLE = 'graphics-document document';
*/ */
export function setA11yDiagramInfo(svg: D3Element, diagramType: string | null | undefined) { export function setA11yDiagramInfo(svg: D3Element, diagramType: string | null | undefined) {
svg.attr('role', SVG_ROLE); svg.attr('role', SVG_ROLE);
// @ts-expect-error https://github.com/DefinitelyTyped/DefinitelyTyped/pull/64684
if (!isEmpty(diagramType)) { if (!isEmpty(diagramType)) {
svg.attr('aria-roledescription', diagramType); svg.attr('aria-roledescription', diagramType);
} }

2
packages/mermaid/src/docs/syntax/mindmap.md
View File

@@ -138,7 +138,7 @@ mindmap
C C
``` ```
_These classes needs top be supplied by the site administrator._ _These classes need to be supplied by the site administrator._
## Unclear indentation ## Unclear indentation

3
packages/mermaid/src/mermaidAPI.ts
View File

@@ -204,7 +204,6 @@ export const createCssStyles = (
} }
// classDefs defined in the diagram text // classDefs defined in the diagram text
// @ts-expect-error https://github.com/DefinitelyTyped/DefinitelyTyped/pull/64684
if (!isEmpty(classDefs) && CLASSDEF_DIAGRAMS.includes(graphType)) { if (!isEmpty(classDefs) && CLASSDEF_DIAGRAMS.includes(graphType)) {
const htmlLabels = config.htmlLabels || config.flowchart?.htmlLabels; // TODO why specifically check the Flowchart diagram config? const htmlLabels = config.htmlLabels || config.flowchart?.htmlLabels; // TODO why specifically check the Flowchart diagram config?
@@ -217,14 +216,12 @@ export const createCssStyles = (
for (const classId in classDefs) { for (const classId in classDefs) {
const styleClassDef = classDefs[classId]; const styleClassDef = classDefs[classId];
// create the css styles for each cssElement and the styles (only if there are styles) // create the css styles for each cssElement and the styles (only if there are styles)
// @ts-expect-error https://github.com/DefinitelyTyped/DefinitelyTyped/pull/64684
if (!isEmpty(styleClassDef.styles)) { if (!isEmpty(styleClassDef.styles)) {
cssElements.forEach((cssElement) => { cssElements.forEach((cssElement) => {
cssStyles += cssImportantStyles(styleClassDef.id, cssElement, styleClassDef.styles); cssStyles += cssImportantStyles(styleClassDef.id, cssElement, styleClassDef.styles);
}); });
} }
// create the css styles for the tspan element and the text styles (only if there are textStyles) // create the css styles for the tspan element and the text styles (only if there are textStyles)
// @ts-expect-error https://github.com/DefinitelyTyped/DefinitelyTyped/pull/64684
if (!isEmpty(styleClassDef.textStyles)) { if (!isEmpty(styleClassDef.textStyles)) {
cssStyles += cssImportantStyles(styleClassDef.id, 'tspan', styleClassDef.textStyles); cssStyles += cssImportantStyles(styleClassDef.id, 'tspan', styleClassDef.textStyles);
} }

16
pnpm-lock.yaml generated
View File

@@ -194,8 +194,8 @@ importers:
specifier: ^7.4.0 specifier: ^7.4.0
version: 7.8.2 version: 7.8.2
dagre-d3-es: dagre-d3-es:
specifier: 7.0.9 specifier: 7.0.10
version: 7.0.9 version: 7.0.10
dayjs: dayjs:
specifier: ^1.11.7 specifier: ^1.11.7
version: 1.11.7 version: 1.11.7
@@ -240,8 +240,8 @@ importers:
specifier: ^21.0.0 specifier: ^21.0.0
version: 21.1.0 version: 21.1.0
'@types/lodash-es': '@types/lodash-es':
specifier: ^4.17.6 specifier: ^4.17.7
version: 4.17.6 version: 4.17.7
'@types/micromatch': '@types/micromatch':
specifier: ^4.0.2 specifier: ^4.0.2
version: 4.0.2 version: 4.0.2
@@ -3006,8 +3006,8 @@ packages:
resolution: {integrity: sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==} resolution: {integrity: sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==}
dev: true dev: true
/@types/lodash-es/4.17.6: /@types/lodash-es/4.17.7:
resolution: {integrity: sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==} resolution: {integrity: sha512-z0ptr6UI10VlU6l5MYhGwS4mC8DZyYer2mCoyysZtSF7p26zOX8UpbrV0YpNYLGS8K4PUFIyEr62IMFFjveSiQ==}
dependencies: dependencies:
'@types/lodash': 4.14.188 '@types/lodash': 4.14.188
dev: true dev: true
@@ -5624,8 +5624,8 @@ packages:
d3-zoom: 3.0.0 d3-zoom: 3.0.0
dev: false dev: false
/dagre-d3-es/7.0.9: /dagre-d3-es/7.0.10:
resolution: {integrity: sha512-rYR4QfVmy+sR44IBDvVtcAmOReGBvRCWDpO2QjYwqgh9yijw6eSHBqaPG/LIOEy7aBsniLvtMW6pg19qJhq60w==} resolution: {integrity: sha512-qTCQmEhcynucuaZgY5/+ti3X/rnszKZhEQH/ZdWdtP1tA/y3VoHJzcVrO9pjjJCNpigfscAtoUB5ONcd2wNn0A==}
dependencies: dependencies:
d3: 7.8.2 d3: 7.8.2
lodash-es: 4.17.21 lodash-es: 4.17.21