From b9e0475d07c9dcc2763e2e3aa2ec15a95ba38127 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 12 Feb 2021 11:11:12 +0200
Subject: [PATCH] Markdown now follow Github Flavor Markdown, including single
 line breaks

---
 .../computation/engine/computeInlineCalculations.js  |  2 +-
 app/imports/ui/components/MarkdownText.vue           |  6 +-----
 app/imports/ui/markdownCofig.js                      | 12 ++++++++++++
 app/imports/ui/vueSetup.js                           |  1 +
 4 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 app/imports/ui/markdownCofig.js

diff --git a/app/imports/api/creature/computation/engine/computeInlineCalculations.js b/app/imports/api/creature/computation/engine/computeInlineCalculations.js
index 1f02854e..bb08e475 100644
--- a/app/imports/api/creature/computation/engine/computeInlineCalculations.js
+++ b/app/imports/api/creature/computation/engine/computeInlineCalculations.js
@@ -23,7 +23,7 @@ function computeInlineCalcsForField(prop, memo, field){
       dependencies,
     } = evaluateCalculation({string: calculation, prop, memo, fn: 'compile'});
     if (result instanceof ErrorNode){
-      result = `<code>${result.toString()}</code>`;
+      result = '`Calculation Error`';
     }
     let computation = {
       calculation,
diff --git a/app/imports/ui/components/MarkdownText.vue b/app/imports/ui/components/MarkdownText.vue
index 6330af1f..e06213b7 100644
--- a/app/imports/ui/components/MarkdownText.vue
+++ b/app/imports/ui/components/MarkdownText.vue
@@ -5,7 +5,6 @@
 
 <script>
 	import marked from 'marked';
-  import DOMPurify from 'dompurify';
 
 	export default {
 		props: {
@@ -17,10 +16,7 @@
 		computed: {
       compiledMarkdown() {
 				if (!this.markdown) return;
-				//TODO Markdown <hr> need to be styled to match their vue components
-        let html = marked(this.markdown);
-        let cleanHtml = DOMPurify.sanitize(html);
-				return cleanHtml;
+				return marked(this.markdown);
       },
     },
 	}
diff --git a/app/imports/ui/markdownCofig.js b/app/imports/ui/markdownCofig.js
new file mode 100644
index 00000000..29381d49
--- /dev/null
+++ b/app/imports/ui/markdownCofig.js
@@ -0,0 +1,12 @@
+import marked from 'marked';
+import DOMPurify from 'dompurify';
+
+marked.setOptions({
+  breaks: true,
+  gfm: true,
+  sanitizer: DOMPurify.sanitize,
+  silent: true,
+  smartLists: true,
+  smartypants: true,
+  baseUrl: 'https://dicecloud.com',
+});
diff --git a/app/imports/ui/vueSetup.js b/app/imports/ui/vueSetup.js
index 2d8a971c..d3b10020 100644
--- a/app/imports/ui/vueSetup.js
+++ b/app/imports/ui/vueSetup.js
@@ -10,6 +10,7 @@ import 'vuetify/dist/vuetify.min.css';
 import '/imports/ui/components/global/globalIndex.js';
 import SvgIconByName from '/imports/ui/icons/SvgIconByName.vue';
 import SVG_ICONS from '/imports/constants/SVG_ICONS.js';
+import '/imports/ui/markdownCofig.js';
 
 let icons = {};