diff --git a/package.json b/package.json index b57b19a4e9..d08fcaa53e 100644 --- a/package.json +++ b/package.json @@ -307,7 +307,7 @@ "@types/react-window": "^1.8.8", "@types/readable-stream": "^4.0.15", "@types/redis-info": "^3.0.3", - "@types/refractor": "^3.4.0", + "@types/refractor": "^3.4.1", "@types/resolve-path": "^1.4.2", "@types/semver": "^7.5.8", "@types/sequelize": "^4.28.20", diff --git a/shared/editor/extensions/Prism.ts b/shared/editor/extensions/Prism.ts index 6643cdf519..e276071e62 100644 --- a/shared/editor/extensions/Prism.ts +++ b/shared/editor/extensions/Prism.ts @@ -108,7 +108,11 @@ function getDecorations({ blocks.forEach((block) => { let startPos = block.pos + 1; - const language = block.node.attrs.language; + const language = ( + block.node.attrs.language === "mermaidjs" + ? "mermaid" + : block.node.attrs.language + ) as string; if (!language || language === "none" || !refractor.registered(language)) { return; } diff --git a/shared/editor/nodes/CodeFence.ts b/shared/editor/nodes/CodeFence.ts index 258bfd6652..1c95979f37 100644 --- a/shared/editor/nodes/CodeFence.ts +++ b/shared/editor/nodes/CodeFence.ts @@ -32,6 +32,8 @@ import kotlin from "refractor/lang/kotlin"; import lisp from "refractor/lang/lisp"; import lua from "refractor/lang/lua"; import markup from "refractor/lang/markup"; +// @ts-expect-error type definition is missing, but package exists +import mermaid from "refractor/lang/mermaid"; import nginx from "refractor/lang/nginx"; import nix from "refractor/lang/nix"; import objectivec from "refractor/lang/objectivec"; @@ -109,6 +111,7 @@ const DEFAULT_LANGUAGE = "javascript"; lisp, lua, markup, + mermaid, nginx, nix, objectivec, diff --git a/yarn.lock b/yarn.lock index 02b11a9079..4b1d030f3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4972,10 +4972,10 @@ resolved "https://registry.yarnpkg.com/@types/redis-info/-/redis-info-3.0.3.tgz#4963fa015a6b448d9c7e27d6cba96d5db7201550" integrity "sha1-SWP6AVprRI2cfifWy6ltXbcgFVA= sha512-VIkNy6JbYI/RLdbPHdm9JQvv6RVld2uE2/6Hdid38Qdq+zvDli2FTpImI8pC5zwp8xS8qVqfzlfyAub8xZEd5g==" -"@types/refractor@^3.4.0": - version "3.4.0" - resolved "https://registry.yarnpkg.com/@types/refractor/-/refractor-3.4.0.tgz#7a8f982e100d3319ee0e8f93a088d093cd145a21" - integrity "sha1-eo+YLhANMxnuDo+ToIjQk80UWiE= sha512-ZVLDkJxBQgvulG7R+xzgsJVODJVr0hlpCiMnEcxeJwCIzCSUwCHrsuQmd9KGZm//ujeuV9WHiVGUawaZkLLJrQ==" +"@types/refractor@^3.4.1": + version "3.4.1" + resolved "https://registry.yarnpkg.com/@types/refractor/-/refractor-3.4.1.tgz#8b109804f77b3da8fad543d3f575fef1ece8835a" + integrity sha512-wYuorIiCTSuvRT9srwt+taF6mH/ww+SyN2psM0sjef2qW+sS8GmshgDGTEDgWB1sTVGgYVE6EK7dBA2MxQxibg== dependencies: "@types/prismjs" "*"