diff --git a/v2/lib/theme/Markdown/index.js b/v2/lib/theme/Markdown/index.js
index 6a2d085dbf..1a9ff4a3c8 100644
--- a/v2/lib/theme/Markdown/index.js
+++ b/v2/lib/theme/Markdown/index.js
@@ -8,125 +8,38 @@
/* eslint-disable */
import React from 'react';
-import Markdown from 'remarkable';
import Helmet from 'react-helmet';
-import hljs from 'highlight.js';
-import chalk from 'chalk';
-import escapeHtml from 'escape-html';
-import anchors from './anchors';
-class MarkdownBlock extends React.Component {
- content() {
- if (this.props.source) {
- return (
-
- );
- }
- return React.Children.map(this.props.children, child => {
- if (typeof child === 'string') {
- return (
-
- );
- }
- return child;
- });
- }
+function Markdown(props) {
+ const {siteConfig} = props;
+ const highlight = Object.assign(
+ {},
+ {
+ version: '9.12.0',
+ theme: 'atom-one-dark',
+ },
+ siteConfig.highlight,
+ );
- renderMarkdown(source) {
- const alias = {
- js: 'jsx',
- };
- const {siteConfig} = this.props;
- const md = new Markdown({
- langPrefix: 'hljs css language-',
- highlight: function(str, rawLang) {
- // Default language fallback
- const defaultLang =
- siteConfig.highlight && siteConfig.highlight.defaultLang;
+ // Use user-provided themeUrl if it exists, else construct one from version and theme.
+ const highlightThemeURL = highlight.themeUrl
+ ? highlight.themeUrl
+ : `https://cdnjs.cloudflare.com/ajax/libs/highlight.js/${
+ highlight.version
+ }/styles/${highlight.theme}.min.css`;
- // No syntax highlighting
- if (rawLang === 'text' || (!rawLang && !defaultLang)) {
- return escapeHtml(str);
- }
-
- // User's own hljs function to register additional languages
- if (siteConfig.highlight && siteConfig.highlight.hljs) {
- siteConfig.highlight.hljs(hljs);
- }
-
- // Syntax highlighting
- const lang = rawLang.toLowerCase() || defaultLang;
- try {
- if (hljs.getLanguage(lang)) {
- return hljs.highlight(lang, str).value;
- }
- } catch (e) {
- console.error(
- chalk.yellow(
- `Highlight.js syntax highlighting for language "${lang}" is not supported.`,
- ),
- );
- }
- return hljs.highlightAuto(str).value;
- },
- html: true,
- linkify: true,
- });
-
- // Register anchors plugin
- md.use(anchors);
-
- // Allow client sites to register their own plugins
- if (siteConfig.markdownPlugins) {
- siteConfig.markdownPlugins.forEach(plugin => {
- md.use(plugin);
- });
- }
-
- const html = md.render(source);
-
- // Ensure fenced code blocks use Highlight.js hljs class
- // https://github.com/jonschlinkert/remarkable/issues/224
- return html.replace(//g, '');
- }
-
- render() {
- const {siteConfig} = this.props;
- const highlight = Object.assign(
- {},
- {
- version: '9.12.0',
- theme: 'atom-one-dark',
- },
- siteConfig.highlight,
- );
-
- // Use user-provided themeUrl if it exists, else construct one from version and theme.
- const highlightThemeURL = highlight.themeUrl
- ? highlight.themeUrl
- : `https://cdnjs.cloudflare.com/ajax/libs/highlight.js/${
- highlight.version
- }/styles/${highlight.theme}.min.css`;
-
- return (
-
-
-
-
- {this.content()}
-
- );
- }
+ return (
+
+
+
+
+
{props.children}
+
/g, '');
/* Return a React component */
return `
import React from 'react';
import Markdown from '@theme/Markdown';
export default () => (
- {${JSON.stringify(content)}}
+
);`;
};
diff --git a/v2/lib/theme/Markdown/toSlug.js b/v2/lib/webpack/loaders/markdown/toSlug.js
similarity index 100%
rename from v2/lib/theme/Markdown/toSlug.js
rename to v2/lib/webpack/loaders/markdown/toSlug.js