Skip to content

Commit

Permalink
Merge pull request #1804 from prupipho/release-readme-updates
Browse files Browse the repository at this point in the history
Release readme updates
  • Loading branch information
sibille committed May 12, 2021
2 parents edda7bc + ebc882e commit 8d0571f
Show file tree
Hide file tree
Showing 5 changed files with 230 additions and 209 deletions.
2 changes: 1 addition & 1 deletion src/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-intl": "^2.8.0",
"react-markdown": "^4.3.1",
"react-markdown": "^6.0.2",
"react-modal": "^3.8.1",
"react-redux": "^7.2.0",
"react-scripts": "4.0.3",
Expand Down
13 changes: 6 additions & 7 deletions src/client/src/pages/DetailsPage/Details/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,20 @@ const Details = ({ detailInfo, formatteDetailInfo, intl }: Props) => {
isAuthorOrVersion?: boolean
) => {
if (isAuthorOrVersion) {
return <ReactMarkdown source={info as string} renderers={{ link: LinkRenderer, paragraph: ParagraphRenderer }} />;
return <ReactMarkdown components={{ link: LinkRenderer, p: ParagraphRenderer }}>{info as string}</ReactMarkdown>;
}
if (formatteDetailInfo) {
if (isMarkdown) {
return (
<ReactMarkdown
source={intl.formatMessage(info as FormattedMessage.MessageDescriptor)}
renderers={{ link: LinkRenderer, paragraph: ParagraphRenderer }}
/>
<ReactMarkdown components={{ link: LinkRenderer, p: ParagraphRenderer }}>
{intl.formatMessage(info as FormattedMessage.MessageDescriptor)}
</ReactMarkdown>
);
}
return intl.formatMessage(info as FormattedMessage.MessageDescriptor);
}
if (isMarkdown) {
return <ReactMarkdown source={info as string} renderers={{ link: LinkRenderer, paragraph: ParagraphRenderer }} />;
return <ReactMarkdown components={{ link: LinkRenderer, p: ParagraphRenderer }}>{info as string}</ReactMarkdown>;
} else {
return info;
}
Expand Down Expand Up @@ -80,7 +79,7 @@ const Details = ({ detailInfo, formatteDetailInfo, intl }: Props) => {
</p>
);
})
: <ReactMarkdown source={detailInfo.licenses} renderers={{ link: LinkRenderer }} /> ||
: <ReactMarkdown components={{ link: LinkRenderer }}>{detailInfo.licenses}</ReactMarkdown> ||
intl!.formatMessage(messages.none)}
</div>
</div>
Expand Down
Loading

0 comments on commit 8d0571f

Please sign in to comment.