From 53455496bf0efadf836fb5f06d467b98eae2a96b Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Mon, 23 Nov 2015 11:04:43 +0900 Subject: [PATCH] =?UTF-8?q?Markdown=E3=81=A7Emoji=E3=81=8C=E4=BD=BF?= =?UTF-8?q?=E3=81=88=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/markdown.js | 2 ++ package.json | 1 + webpack.config.js | 3 ++- webpack.config.production.js | 3 ++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/markdown.js b/lib/markdown.js index c8b4762b..b27830ea 100644 --- a/lib/markdown.js +++ b/lib/markdown.js @@ -1,5 +1,6 @@ import markdownit from 'markdown-it' import hljs from 'highlight.js' +import emoji from 'markdown-it-emoji' var md = markdownit({ typographer: true, @@ -18,6 +19,7 @@ var md = markdownit({ return ''; // use external default escaping } }) +md.use(emoji) export default function markdown (content) { if (content == null) content = '' diff --git a/package.json b/package.json index b3986797..a23a3eba 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "highlight.js": "^8.9.1", "lodash": "^3.10.1", "markdown-it": "^4.3.1", + "markdown-it-emoji": "^1.1.0", "md5": "^2.0.0", "moment": "^2.10.3", "socket.io-client": "^1.3.6", diff --git a/webpack.config.js b/webpack.config.js index 6d255e54..1708bc96 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -69,7 +69,8 @@ var config = { 'lodash', 'markdown-it', 'moment', - 'highlight.js' + 'highlight.js', + 'markdown-it-emoji' ] } diff --git a/webpack.config.production.js b/webpack.config.production.js index 8129cefe..a90db0e4 100644 --- a/webpack.config.production.js +++ b/webpack.config.production.js @@ -45,7 +45,8 @@ module.exports = { 'lodash', 'markdown-it', 'moment', - 'highlight.js' + 'highlight.js', + 'markdown-it-emoji' ], resolve: { extensions: ['', '.js', '.jsx', 'styl']