Merge branch 'develop' into feature/markdownlint

app.json

@@ -11,10 +11,6 @@
     "logo": "https://github.com/hackmdio/codimd/raw/master/public/codimd-icon-1024.png",
     "success_url": "/",
     "env": {
-        "BUILD_ASSETS": {
-            "description": "Our build script variable",
-            "value": "true"
-        },
         "NPM_CONFIG_PRODUCTION": {
             "description": "Let npm also install development build tool",
             "value": "false"

bin/heroku

@@ -2,7 +2,7 @@
 
 set -e
 
-if [ "$BUILD_ASSETS" = true ]; then
+if [ ! -z "$DYNO" ]; then
   # setup config files
   cat << EOF > .sequelizerc
 var path = require('path');

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",
@@ -152,6 +151,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",
@@ -171,6 +171,7 @@
     "jsonlint": "~1.6.2",
     "less": "~3.9.0",
     "less-loader": "~4.1.0",
+    "markdown-it-ruby": "^0.1.1",
     "mini-css-extract-plugin": "~0.4.1",
     "mocha": "~5.2.0",
     "mock-require": "~3.0.3",

public/docs/features.md

@@ -435,6 +435,7 @@ Subscript: H~2~O
 
 ==Marked text==
 
+{ruby base|rubytext}
 
 ### Blockquotes
 

public/js/extra.js

@@ -1001,6 +1001,7 @@ md.use(require('markdown-it-mathjax')({
   afterDisplayMath: '\\]</span>'
 }))
 md.use(require('markdown-it-imsize'))
+md.use(require('markdown-it-ruby'))
 
 md.use(require('markdown-it-emoji'), {
   shortcuts: {}

public/js/render.js

@@ -20,7 +20,7 @@ whiteList['style'] = []
 // allow kbd tag
 whiteList['kbd'] = []
 // allow ifram tag with some safe attributes
-whiteList['iframe'] = ['allowfullscreen', 'name', 'referrerpolicy', 'sandbox', 'src', 'width', 'height']
+whiteList['iframe'] = ['allowfullscreen', 'name', 'referrerpolicy', 'src', 'width', 'height']
 // allow summary tag
 whiteList['summary'] = []
 // allow ruby tag

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
@@ -249,7 +249,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',
@@ -293,7 +293,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',
@@ -334,7 +334,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',
@@ -379,6 +379,7 @@ module.exports = {
       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'),
+      'emojify.js': path.join(__dirname, 'node_modules/@hackmd/emojify.js/dist/js/emojify-browser.min.js'),
       'markdown-it': path.join(__dirname, 'node_modules/markdown-it/dist/markdown-it.js')
     }
   },