Skip to content
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.

Use marked instead of roaster + update marked #1161

Merged
merged 9 commits into from Sep 30, 2020
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/package-card.js
Expand Up @@ -484,7 +484,7 @@ export default class PackageCard {
marked = require('marked')
}

this.refs.packageMessage.innerHTML = marked(message)
this.refs.packageMessage.innerHTML = marked(message, {breaks: true})
}
}

Expand Down
4 changes: 2 additions & 2 deletions lib/package-readme-view.js
@@ -1,6 +1,6 @@
/** @babel */

import roaster from 'roaster'
import marked from 'marked'
import createDOMPurify from 'dompurify'

function sanitize (html, readmeSrc) {
Expand Down Expand Up @@ -69,7 +69,7 @@ export default class PackageReadmeView {
container.appendChild(this.packageReadme)
this.element.appendChild(container)

roaster(readme || '### No README.', (err, content) => {
marked(readme || '### No README.', {breaks: false}, (err, content) => {
if (err) {
this.packageReadme.innerHTML = '<h3>Error parsing README</h3>'
} else {
Expand Down
10 changes: 8 additions & 2 deletions lib/rich-description.js
Expand Up @@ -4,11 +4,17 @@ const renderer = new marked.Renderer()
renderer.code = () => ''
renderer.blockquote = () => ''
renderer.heading = () => ''
renderer.html = () => ''
renderer.html = (src) => {
const match = src.match(/<br\/>/)
aminya marked this conversation as resolved.
Show resolved Hide resolved
if (match) {
return `<br/>`
}
return ''
}
renderer.image = () => ''
renderer.list = () => ''

const markdown = text => marked(text, {renderer}).replace(/<p>(.*)<\/p>/, '$1').trim()
const markdown = text => marked(text, {renderer, breaks: true}).replace(/<p>(.*)<\/p>/, '$1').trim()

module.exports = {
getSettingDescription (keyPath) {
Expand Down
161 changes: 9 additions & 152 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
Expand Up @@ -24,9 +24,8 @@
"fuzzaldrin": "^2.1",
"glob": "4.3.1",
"hosted-git-info": "^2.1.4",
"marked": "^0.3.6",
"marked": "^1.1.1",
"request": "^2.83.0",
"roaster": "^1.1.2",
"season": "^6.0.2",
"semver": "^5.3.0",
"underscore-plus": "^1.0.6"
Expand Down