From 1d65a38dcf04e714d3a9511bc2c044d6f883f55e Mon Sep 17 00:00:00 2001 From: Zhicheng WANG Date: Tue, 1 Jan 2019 19:16:14 +0800 Subject: [PATCH] Revert "fix: move mark code to post-process-html step" This reverts commit 0cb8d723 --- .../post-process-package/processors/post-process-html.js | 3 +-- .../transforms/remark-package/services/renderMarkdown.js | 4 +++- .../processors => remark-package/services}/translator.js | 0 .../services}/translator.mocha.js | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename aio/tools/transforms/{post-process-package/processors => remark-package/services}/translator.js (100%) rename aio/tools/transforms/{post-process-package/processors => remark-package/services}/translator.mocha.js (100%) diff --git a/aio/tools/transforms/post-process-package/processors/post-process-html.js b/aio/tools/transforms/post-process-package/processors/post-process-html.js index cd455db85c..5f8f837bf5 100644 --- a/aio/tools/transforms/post-process-package/processors/post-process-html.js +++ b/aio/tools/transforms/post-process-package/processors/post-process-html.js @@ -1,5 +1,4 @@ const rehype = require('rehype'); -const {mark} = require('./translator'); /** * @dgProcessor postProcessHtml @@ -36,7 +35,7 @@ module.exports = function postProcessHtml(log, createDocMessage) { .forEach(doc => { try { vFile = engine.processSync(doc.renderedContent); - doc.renderedContent = mark(vFile.contents); + doc.renderedContent = vFile.contents; vFile.messages.forEach(m => { log.warn(createDocMessage(m.message, doc)); }); diff --git a/aio/tools/transforms/remark-package/services/renderMarkdown.js b/aio/tools/transforms/remark-package/services/renderMarkdown.js index 4da595c2f5..ec13d23239 100644 --- a/aio/tools/transforms/remark-package/services/renderMarkdown.js +++ b/aio/tools/transforms/remark-package/services/renderMarkdown.js @@ -3,6 +3,8 @@ const html = require('remark-html'); const code = require('./handlers/code'); const mapHeadings = require('./plugins/mapHeadings'); +const {mark} = require('./translator'); + /** * @dgService renderMarkdown * @description @@ -24,7 +26,7 @@ module.exports = function renderMarkdown() { .use(mapHeadings(headingMap)) .use(html, { handlers: { code } }); - return renderer.processSync(content).toString(); + return mark(renderer.processSync(content).toString()); }; /** diff --git a/aio/tools/transforms/post-process-package/processors/translator.js b/aio/tools/transforms/remark-package/services/translator.js similarity index 100% rename from aio/tools/transforms/post-process-package/processors/translator.js rename to aio/tools/transforms/remark-package/services/translator.js diff --git a/aio/tools/transforms/post-process-package/processors/translator.mocha.js b/aio/tools/transforms/remark-package/services/translator.mocha.js similarity index 100% rename from aio/tools/transforms/post-process-package/processors/translator.mocha.js rename to aio/tools/transforms/remark-package/services/translator.mocha.js