status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Experimental support for customized emojify version
This commit is contained in:
Max Wu 2019-09-08 00:47:35 +08:00 committed by GitHub
parent a729a285c0 6a3409f7b7
commit 91cff6e6c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -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",

11
webpack.common.js
View File

@ -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'),
}
},