FEATURE: support markdown it engine

assets/javascripts/lib/discourse-markdown/spoiler-alert.js.es6

@@ -17,7 +17,31 @@ function replaceSpoilers(text) {
   return text;
 }
 
+function setupMarkdownIt(helper) {
+
+  helper.registerOptions((opts, siteSettings) => {
+    opts.features['spoiler-alert'] = !!siteSettings.spoiler_enabled;
+  });
+
+  helper.registerPlugin(md => {
+    md.inline.bbcode_ruler.push('spoiler', {
+      tag: 'spoiler',
+      wrap: 'span.spoiler'
+    });
+
+    md.block.bbcode_ruler.push('spoiler', {
+      tag: 'spoiler',
+      wrap: 'div.spoiler'
+    });
+  });
+}
+
 export function setup(helper) {
   helper.whiteList([ 'span.spoiler', 'div.spoiler' ]);
-  helper.addPreProcessor(replaceSpoilers);
+
+  if (helper.markdownIt) {
+    setupMarkdownIt(helper);
+  } else {
+    helper.addPreProcessor(replaceSpoilers);
+  }
 }

spec/pretty_text_spec.rb

@@ -0,0 +1,31 @@
+require 'rails_helper'
+
+require 'rails_helper'
+require 'html_normalize'
+
+describe PrettyText do
+
+  def n(html)
+    HtmlNormalize.normalize(html)
+  end
+
+  context 'markdown it' do
+    before do
+      SiteSetting.enable_experimental_markdown_it = true
+    end
+
+    it 'can spoil blocks' do
+      md = PrettyText.cook("[spoiler]\nmy tests fail\n[/spoiler]")
+      html = "<div class=\"spoiler\">\n<p>my tests fail</p>\n</div>"
+
+      expect(md).to eq(html)
+    end
+
+    it 'can spoil inline' do
+      md = PrettyText.cook('I like watching [spoiler]my tests fail[/spoiler]')
+      html = '<p>I like watching <span class="spoiler">my tests fail</span></p>'
+
+      expect(md).to eq(html)
+    end
+  end
+end