Merge pull request #146 from marp-team/revert-enhanced-plugin-system

Revert enhanced plugin system
marp-team · Apr 1, 2019 · 46712a1 · 46712a1
2 parents 5588207 + b31a89e
commit 46712a1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 154 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,10 @@
 
 - Mark unused constructor options as deprecated: `backgroundSyntax`, `filters`, `inlineStyle`, and `scopedStyle` ([#144](https://github.com/marp-team/marpit/pull/144))
 
+### Removed
+
+- Enhanced plugin system ([#146](https://github.com/marp-team/marpit/pull/146))
+
 ## v0.8.0 - 2019-03-13
 
 ### Added

diff --git a/src/helpers/plugin.js b/src/helpers/plugin.js
diff --git a/src/marpit.js b/src/marpit.js
@@ -1,5 +1,4 @@
 import MarkdownIt from 'markdown-it'
-import useMarpitPlugin, { MarpitSymbol } from './helpers/plugin'
 import wrapArray from './helpers/wrap_array'
 import ThemeSet from './theme_set'
 import { marpitContainer } from './element'
@@ -157,23 +156,21 @@ class Marpit {
   applyMarkdownItPlugins(md = this.markdown) {
     const { filters, looseYAML, scopedStyle } = this.options
 
-    useMarpitPlugin(md, () => {
-      md.use(marpitComment, { looseYAML })
-        .use(marpitStyleParse, this)
-        .use(marpitSlide)
-        .use(marpitParseDirectives, this, { looseYAML })
-        .use(marpitApplyDirectives, this)
-        .use(marpitHeaderAndFooter)
-        .use(marpitHeadingDivider, this)
-        .use(marpitSlideContainer, this.slideContainers)
-        .use(marpitContainerPlugin, this.containers)
-        .use(marpitParseImage, { filters })
-        .use(marpitSweep)
-        .use(marpitInlineSVG, this)
-        .use(marpitStyleAssign, this, { supportScoped: scopedStyle })
-        .use(marpitCollect, this)
-        .use(marpitBackgroundImage, this)
-    })
+    md.use(marpitComment, { looseYAML })
+      .use(marpitStyleParse, this)
+      .use(marpitSlide)
+      .use(marpitParseDirectives, this, { looseYAML })
+      .use(marpitApplyDirectives, this)
+      .use(marpitHeaderAndFooter)
+      .use(marpitHeadingDivider, this)
+      .use(marpitSlideContainer, this.slideContainers)
+      .use(marpitContainerPlugin, this.containers)
+      .use(marpitParseImage, { filters })
+      .use(marpitSweep)
+      .use(marpitInlineSVG, this)
+      .use(marpitStyleAssign, this, { supportScoped: scopedStyle })
+      .use(marpitCollect, this)
+      .use(marpitBackgroundImage, this)
   }
 
   /**
@@ -194,11 +191,8 @@ class Marpit {
    * @returns {Marpit~RenderResult} An object of rendering result.
    */
   render(markdown, env = {}) {
-    const html = this.renderMarkdown(markdown, env)
-    if (!this.markdown[MarpitSymbol]) return { html, css: '', comments: [] }
-
     return {
-      html,
+      html: this.renderMarkdown(markdown, env),
       css: this.renderStyle(this.lastGlobalDirectives.theme),
       comments: this.lastComments,
     }
@@ -220,7 +214,7 @@ class Marpit {
   renderMarkdown(markdown, env = {}) {
     const tokens = this.markdown.parse(markdown, env)
 
-    if (env.htmlAsArray && this.markdown[MarpitSymbol]) {
+    if (env.htmlAsArray) {
       return this.lastSlideTokens.map(slideTokens =>
         this.markdown.renderer.render(slideTokens, this.markdown.options, env)
       )
@@ -260,10 +254,7 @@ class Marpit {
    * @returns {Marpit} The called {@link Marpit} instance for chainable.
    */
   use(plugin, ...params) {
-    useMarpitPlugin(this.markdown, () =>
-      plugin.call(this.markdown, this.markdown, ...params)
-    )
-
+    plugin.call(this.markdown, this.markdown, ...params)
     return this
   }
 }

diff --git a/test/marpit.js b/test/marpit.js
@@ -374,52 +374,5 @@ describe('Marpit', () => {
       expect(plugin).toBeCalledWith(instance.markdown, 'parameter')
       expect(instance.markdown.extended).toBe('parameter')
     })
-
-    describe('Enhancement of markdown-it plugin system', () => {
-      describe('StateCore#marpit', () => {
-        const controlMarpitPlugin = md =>
-          md.core.ruler.before('normalize', 'disable_marpit', state =>
-            state.marpit(state.env.marpit)
-          )
-
-        it('toggles enable or disable Marpit core rules', () => {
-          const marpitRule = jest.fn()
-          const mdRule = jest.fn()
-
-          const marpit = new Marpit()
-            .use(controlMarpitPlugin)
-            .use(md => md.core.ruler.after('normalize', 'test', marpitRule))
-
-          marpit.markdown.use(md =>
-            md.core.ruler.after('normalize', 'test', mdRule)
-          )
-
-          const retDisabled = marpit.render('', { marpit: false })
-          expect(marpitRule).not.toBeCalled()
-          expect(mdRule).toBeCalled()
-
-          expect(retDisabled.html).not.toContain('section')
-          expect(retDisabled.css).toBe('')
-          expect(retDisabled.comments).toStrictEqual([])
-
-          const retEnabled = marpit.render('', { marpit: true })
-          expect(marpitRule).toBeCalled()
-          expect(mdRule).toBeCalledTimes(2)
-
-          expect(retEnabled.html).toContain('section')
-          expect(retEnabled.css).not.toBe('')
-          expect(retEnabled.comments).toStrictEqual([[]])
-        })
-
-        it('allows control also in the instance of markdown-it', () => {
-          const md = new MarkdownIt()
-            .use(new Marpit().markdownItPlugins)
-            .use(controlMarpitPlugin)
-
-          expect(md.render('', { marpit: false })).not.toContain('section')
-          expect(md.render('', { marpit: true })).toContain('section')
-        })
-      })
-    })
   })
 })