-> v2.0.3

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.0.3
+### Bug fixes
+- fix: rendering emojis
+- fix: css var polyfill
+
 ## 2.0.2
 
 ### Bug fixes

docs/_coverpage.md

@@ -1,6 +1,6 @@
 ![logo](_media/icon.svg)
 
-# docsify <small>2.0.2</small>
+# docsify <small>2.0.3</small>
 
 > A magical documentation site generator.
 

lib/docsify.js

@@ -170,6 +170,7 @@ var merge = Object.assign || function (to) {
 
 function emojify (text) {
   return text
+    .replace(/<(pre|template)[^>]*?>([\s\S]+)<\/(pre|template)>/g, function (match) { return match.replace(/:/g, '__colon__'); })
     .replace(/:(\w*?):/ig, '<img class="emoji" src="https://assets-cdn.github.com/images/icons/emoji/$1.png" alt="$1" />')
     .replace(/__colon__/g, ':')
 }
@@ -2509,14 +2510,17 @@ function cssVars () {
     if (block.nodeName === 'STYLE') {
       replaceVar(block);
     } else if (block.nodeName === 'LINK') {
-      load(block.getAttribute('href'))
+      var href = block.getAttribute('href');
-        .then(function (res) {
-          var style = document.createElement('style');
 
-          style.innerHTML = res;
+      if (!/\.css$/.test(href)) { return }
-          document.head.appendChild(style);
+
-          replaceVar(style);
+      load(href).then(function (res) {
-        });
+        var style = document.createElement('style');
+
+        style.innerHTML = res;
+        document.head.appendChild(style);
+        replaceVar(style);
+      });
     }
   });
 }
@@ -2557,7 +2561,7 @@ function init () {
 
     var hl = prism.highlight(code, prism.languages[lang] || prism.languages.markup);
 
-    return ("<pre v-pre data-lang=\"" + lang + "\"><code class=\"lang-" + lang + "\">" + (hl.replace(/:/g, '__colon__')) + "</code></pre>")
+    return ("<pre v-pre data-lang=\"" + lang + "\"><code class=\"lang-" + lang + "\">" + hl + "</code></pre>")
   };
   renderer.link = function (href, title, text) {
     if (!/:/.test(href)) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "A magical documentation generator.",
   "main": "lib/docsify.js",
   "files": [

src/polyfill.js

@@ -14,14 +14,17 @@ export function cssVars () {
     if (block.nodeName === 'STYLE') {
       replaceVar(block)
     } else if (block.nodeName === 'LINK') {
-      load(block.getAttribute('href'))
+      const href = block.getAttribute('href')
-        .then(res => {
-          const style = document.createElement('style')
 
-          style.innerHTML = res
+      if (!/\.css$/.test(href)) return
-          document.head.appendChild(style)
+
-          replaceVar(style)
+      load(href).then(res => {
-        })
+        const style = document.createElement('style')
+
+        style.innerHTML = res
+        document.head.appendChild(style)
+        replaceVar(style)
+      })
     }
   })
 }

src/render.js

@@ -39,7 +39,7 @@ export function init () {
   renderer.code = function (code, lang = '') {
     const hl = Prism.highlight(code, Prism.languages[lang] || Prism.languages.markup)
 
-    return `<pre v-pre data-lang="${lang}"><code class="lang-${lang}">${hl.replace(/:/g, '__colon__')}</code></pre>`
+    return `<pre v-pre data-lang="${lang}"><code class="lang-${lang}">${hl}</code></pre>`
   }
   renderer.link = function (href, title, text) {
     if (!/:/.test(href)) {

src/util.js

@@ -160,6 +160,7 @@ export const merge = Object.assign || function (to) {
 
 export function emojify (text) {
   return text
+    .replace(/<(pre|template)[^>]*?>([\s\S]+)<\/(pre|template)>/g, match => match.replace(/:/g, '__colon__'))
     .replace(/:(\w*?):/ig, '<img class="emoji" src="https://assets-cdn.github.com/images/icons/emoji/$1.png" alt="$1" />')
     .replace(/__colon__/g, ':')
 }