Skip to content

Commit 2ea0e43

Browse files
committed
Merge branch 'master' into merge
2 parents 131c29b + 2fb61db commit 2ea0e43

File tree

4 files changed

+207
-193
lines changed

4 files changed

+207
-193
lines changed

src/parseMarkdownToJSX.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import { parseMarkdownToJSXProps } from "./types";
44
export const parseMarkdownToJSX = ({
55
markdown,
66
customStyles,
7-
extensions,
87
}: parseMarkdownToJSXProps) => {
98
const parser = new MarkdownParser({ customStyles });
10-
return parser.parse(markdown, extensions);
9+
return parser.parse(markdown);
1110
};

src/parser.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
import { marked, MarkedExtension, RendererObject } from "marked";
1+
import { marked, Renderer } from "marked";
22
import { StylesType } from "./types";
33
import { initRenderer } from "./utils";
44

55
export class MarkdownParser {
6-
private readonly renderer: RendererObject;
6+
private readonly renderer: Renderer;
77

88
constructor({ customStyles }: { customStyles?: StylesType }) {
99
this.renderer = initRenderer({ customStyles });
1010
}
1111

12-
parse(markdown: string, extensions: MarkedExtension[] = []) {
13-
marked.use(...extensions);
14-
marked.use({ renderer: this.renderer });
15-
return marked.parse(markdown);
12+
parse(markdown: string) {
13+
return marked.parse(markdown, {
14+
renderer: this.renderer,
15+
async: false,
16+
});
1617
}
1718
}

src/types.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { MarkedExtension } from "marked";
21
import { CSSProperties } from "react";
32

43
export type StylesType = {
@@ -37,5 +36,4 @@ export type initRendererProps = {
3736
export type parseMarkdownToJSXProps = {
3837
markdown: string;
3938
customStyles?: StylesType;
40-
extensions?: MarkedExtension[];
4139
};

0 commit comments

Comments
 (0)