Merge 9d4c712b48 into 6ae53bf1bd

client/components/editor/editor-markdown.vue

@@ -250,7 +250,7 @@ const md = new MarkdownIt({
   html: true,
   breaks: true,
   linkify: true,
-  typography: true,
+  typographer: true,
   highlight(str, lang) {
     if (lang === 'diagram') {
       return `<pre class="diagram">` + Buffer.from(str, 'base64').toString() + `</pre>`
@@ -817,6 +817,9 @@ export default {
 
     this.cm.on('paste', this.onCmPaste)
 
+    // Set markdown rendering settings
+    md.set(siteConfig.mdEditorConfig)
+
     // Render initial preview
 
     this.processContent(this.$store.get('editor/content'))

server/controllers/common.js

@@ -110,6 +110,19 @@ router.get(['/e', '/e/*'], async (req, res, next) => {
 
   req.i18n.changeLanguage(pageArgs.locale)
 
+  // -> Set Markdown Editor config for preview rendering
+  const renderers = await WIKI.models.renderers.getRenderers()
+  const md = _.find(renderers, ['key', 'markdownCore'])
+
+  const keyMaps = { allowHTML: 'html', linebreaks: 'breaks' }
+  const config = _.transform(md.config, (res, value, key) => {
+    if (_.has(keyMaps, key)) {
+      key = keyMaps[key]
+    }
+    res[key] = value
+  }, {})
+  _.set(res, 'locals.siteConfig.mdEditorConfig', config)
+
   // -> Set Editor Lang
   _.set(res, 'locals.siteConfig.lang', pageArgs.locale)
   _.set(res, 'locals.siteConfig.rtl', req.i18n.dir() === 'rtl')