Merge pull request #1261 from hackmdio/feature/emojify-upgrade

Experimental support for customized emojify version

Author: jackycute

package.json

@@ -55,7 +55,6 @@
     "cookie-parser": "~1.4.4",
     "deep-freeze": "~0.0.1",
     "ejs": "~2.6.2",
-    "emojify.js": "~1.1.0",
     "express": "~4.17.1",
     "express-session": "~1.16.2",
     "file-saver": "~2.0.2",
@@ -151,6 +150,7 @@
     "xss": "~1.0.6"
   },
   "devDependencies": {
+    "@hackmd/emojify.js": "^2.1.0",
     "acorn": "~6.1.1",
     "babel-core": "~6.26.3",
     "babel-loader": "~7.1.4",

webpack.common.js

@@ -139,7 +139,7 @@ module.exports = {
         to: 'MathJax/'
       },
       {
-        context: path.join(__dirname, 'node_modules/emojify.js'),
+        context: path.join(__dirname, 'node_modules/@hackmd/emojify.js'),
         from: {
           glob: 'dist/**/*',
           dot: false
@@ -245,7 +245,7 @@ module.exports = {
       'expose-loader?moment!moment',
       'script-loader!handlebars',
       'expose-loader?hljs!highlight.js',
-      'expose-loader?emojify!emojify.js',
+      'emojify.js',
       'script-loader!gist-embed',
       'script-loader!codemirror',
       'script-loader!inlineAttachment',
@@ -289,7 +289,7 @@ module.exports = {
       'expose-loader?moment!moment',
       'script-loader!handlebars',
       'expose-loader?hljs!highlight.js',
-      'expose-loader?emojify!emojify.js',
+      'emojify.js',
       'script-loader!gist-embed',
       'flowchart.js',
       'imports-loader?Raphael=raphael!js-sequence-diagrams',
@@ -330,7 +330,7 @@ module.exports = {
       'expose-loader?moment!moment',
       'script-loader!handlebars',
       'expose-loader?hljs!highlight.js',
-      'expose-loader?emojify!emojify.js',
+      'emojify.js',
       'script-loader!gist-embed',
       'flowchart.js',
       'imports-loader?Raphael=raphael!js-sequence-diagrams',
@@ -374,7 +374,8 @@ module.exports = {
       'js-sequence-diagrams': path.join(__dirname, 'node_modules/@hackmd/js-sequence-diagrams/build/main.js'),
       vega: path.join(__dirname, 'node_modules/vega/build/vega.min.js'),
       'vega-lite': path.join(__dirname, 'node_modules/vega-lite/build/vega-lite.min.js'),
-      'vega-embed': path.join(__dirname, 'node_modules/vega-embed/build/vega-embed.min.js')
+      'vega-embed': path.join(__dirname, 'node_modules/vega-embed/build/vega-embed.min.js'),
+      'emojify.js': path.join(__dirname, 'node_modules/@hackmd/emojify.js/dist/js/emojify-browser.min.js'),
     }
   },