Skip to content

Commit e7fc21e

Browse files
chore: Add react-syntax-highlight back (#5369)
1 parent 2b864ce commit e7fc21e

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

site/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
"react-i18next": "12.0.0",
6565
"react-markdown": "8.0.3",
6666
"react-router-dom": "6.4.1",
67+
"react-syntax-highlighter": "15.5.0",
6768
"remark-gfm": "3.0.1",
6869
"sourcemapped-stacktrace": "1.1.11",
6970
"tzdata": "1.0.30",
@@ -93,6 +94,7 @@
9394
"@types/react": "18.0.15",
9495
"@types/react-dom": "18.0.6",
9596
"@types/react-helmet": "6.1.5",
97+
"@types/react-syntax-highlighter": "15.5.5",
9698
"@types/semver": "7.3.12",
9799
"@types/superagent": "4.1.15",
98100
"@types/ua-parser-js": "0.7.36",

site/src/components/Markdown/Markdown.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import ReactMarkdown from "react-markdown"
1111
import { Prism as SyntaxHighlighter } from "react-syntax-highlighter"
1212
import gfm from "remark-gfm"
1313
import { colors } from "theme/colors"
14-
import darcula from "react-syntax-highlighter/dist/cjs/styles/prism/darcula"
14+
import { darcula } from "react-syntax-highlighter/dist/cjs/styles/prism"
1515

1616
export interface MarkdownProps {
1717
children: string
@@ -41,13 +41,14 @@ export const Markdown: FC<{ children: string }> = ({ children }) => {
4141
return <pre>{children}</pre>
4242
},
4343

44-
code: ({ node, inline, className, children, ...props }) => {
44+
code: ({ node, inline, className, children, style, ...props }) => {
4545
const match = /language-(\w+)/.exec(className || "")
4646

4747
return !inline && match ? (
4848
<SyntaxHighlighter
4949
style={darcula}
50-
language={match[1]}
50+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- this can be undefined
51+
language={match[1] ?? "language-shell"}
5152
useInlineStyles={false}
5253
// Use inline styles does not work correctly
5354
// https://github.com/react-syntax-highlighter/react-syntax-highlighter/issues/329

site/yarn.lock

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3214,6 +3214,13 @@
32143214
dependencies:
32153215
"@types/react" "*"
32163216

3217+
"@types/react-syntax-highlighter@15.5.5":
3218+
version "15.5.5"
3219+
resolved "https://registry.yarnpkg.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-15.5.5.tgz#4d3b51f8956195f1f63360ff03f8822c5d74c516"
3220+
integrity sha512-QH3JZQXa2usAvJvSsdSUJ4Yu4j8ReuZpgRrEW+XP+Rmosbn425YshW9iGEb/pAARm8496axHhHUPRH3UmTiB6A==
3221+
dependencies:
3222+
"@types/react" "*"
3223+
32173224
"@types/react-transition-group@^4.2.0":
32183225
version "4.4.5"
32193226
resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.5.tgz#aae20dcf773c5aa275d5b9f7cdbca638abc5e416"
@@ -11752,7 +11759,7 @@ react-router@6.4.1:
1175211759
dependencies:
1175311760
"@remix-run/router" "1.0.1"
1175411761

11755-
react-syntax-highlighter@^15.4.5:
11762+
react-syntax-highlighter@15.5.0, react-syntax-highlighter@^15.4.5:
1175611763
version "15.5.0"
1175711764
resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-15.5.0.tgz#4b3eccc2325fa2ec8eff1e2d6c18fa4a9e07ab20"
1175811765
integrity sha512-+zq2myprEnQmH5yw6Gqc8lD55QHnpKaU8TOcFeC/Lg/MQSs8UknEA0JC4nTZGFAXC2J2Hyj/ijJ7NlabyPi2gg==

0 commit comments

Comments
 (0)