gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace remark with unified for docs and extensibility

Browse Source
This commit is contained in:
Shawn Erquhart
2017-05-24 13:21:15 -04:00
parent 514fbb30b8
commit adcb215fbd
3 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/components/MarkupItReactRenderer/index.js
View File

@ -1,16 +1,10 @@
import React, { PropTypes } from "react";
import Remark from "remark";
import toHAST from "mdast-util-to-hast";
import hastToHTML from "hast-util-to-html";
import unified from 'unified';
import markdown from 'remark-parse';
import rehype from 'remark-rehype';
import html from 'rehype-stringify';
import registry from "../../lib/registry";
// Setup Remark.
const remark = new Remark({
commonmark: true,
footnotes: true,
pedantic: true,
});
export default class MarkupItReactRenderer extends React.Component {
constructor(props) {
super(props);
@ -22,11 +16,12 @@ export default class MarkupItReactRenderer extends React.Component {
}
render() {
const { value } = this.props;
const mdast = remark.parse(value);
const hast = toHAST(mdast, { allowDangerousHTML: true });
const html = hastToHTML(hast, { allowDangerousHTML: true });
return <div dangerouslySetInnerHTML={{ __html: html }} />; // eslint-disable-line react/no-danger
const doc = unified()
.use(markdown, { commonmark: true, footnotes: true, pedantic: true })
.use(rehype, { allowDangerousHTML: true })
.use(html, { allowDangerousHTML: true })
.processSync(this.props.value);
return <div dangerouslySetInnerHTML={{ __html: doc }} />; // eslint-disable-line react/no-danger
}
}

35
src/components/Widgets/MarkdownControlElements/VisualEditor/parser.js
View File

@ -4,22 +4,16 @@
https://github.com/ProseMirror/prosemirror-markdown/blob/master/src/from_markdown.js
*/
import Remark from "remark";
const visit = require("unist-util-visit");
const { Mark } = require("prosemirror-model");
import unified from 'unified';
import markdown from 'remark-parse';
import visit from 'unist-util-visit';
import { Mark } from 'prosemirror-model';
let schema;
let plugins
let activeMarks = Mark.none;
let textsArray = [];
// Setup Remark.
const remark = new Remark({
commonmark: true,
footnotes: true,
pedantic: true,
});
const processMdastNode = node => {
if (node.type === "root") {
const content = node.children.map(childNode => processMdastNode(childNode));
@ -139,25 +133,28 @@ const processMdastNode = node => {
activeMarks = mark.removeFromSet(activeMarks);
return;
}
return doc;
};
const compileMarkdownToProseMirror = src => {
// console.log(src);
// Clear out any old state.
let activeMarks = Mark.none;
let textsArray = [];
const mdast = remark.parse(src);
const doc = processMdastNode(mdast);
return doc;
const result = unified()
.use(markdown, { commonmark: true, footnotes: true, pedantic: true })
.parse(src);
const output = unified()
.use(() => processMdastNode)
.runSync(result);
return output;
};
module.exports = (s, p) => {
//console.log(s)
//console.log(s.nodes.code_block.create({ params: { language: 'javascript' } }))
const parser = (s, p) => {
schema = s;
plugins = p;
return compileMarkdownToProseMirror;
};
export default parser;