chore: add changelog 4.8.1

[build] 4.8.1
fix(compiler): prevent render of html code in paragraph, fixed #663
2026-08-10 13:56:12 +10:00 · 2018-10-31 22:08:23 +08:00 · 2018-10-31 22:08:23 +08:00 · 2018-10-31 22:05:24 +08:00 · 2018-10-31 21:19:35 +08:00 · 2018-10-31 21:15:07 +08:00
13 changed files with 67 additions and 167 deletions
@@ -1,3 +1,20 @@
+<a name="4.8.1"></a>
+## [4.8.1](https://github.com/docsifyjs/docsify/compare/v4.8.0...v4.8.1) (2018-10-31)
+
+
+### Bug Fixes
+
+* ssr package dep, fixed [#605](https://github.com/docsifyjs/docsify/issues/605) ([2bc880d](https://github.com/docsifyjs/docsify/commit/2bc880d))
+* **compiler:** extra quotes for codeblock ([4f588e0](https://github.com/docsifyjs/docsify/commit/4f588e0))
+* **compiler:** prevent render of html code in paragraph, fixed [#663](https://github.com/docsifyjs/docsify/issues/663) ([d35059d](https://github.com/docsifyjs/docsify/commit/d35059d))
+
+
+### Features
+
+* upgrade PrismJS, fixed [#534](https://github.com/docsifyjs/docsify/issues/534) ([4805cb5](https://github.com/docsifyjs/docsify/commit/4805cb5))
+
+
+
 <a name="4.8.0"></a>
 # [4.8.0](https://github.com/docsifyjs/docsify/compare/v4.7.1...v4.8.0) (2018-10-31)

@@ -8,14 +8,12 @@ const isProd = process.env.NODE_ENV === 'production'
 const version = process.env.VERSION || require('../package.json').version
 const chokidar = require('chokidar')
 const path = require('path')
-const json = require('rollup-plugin-json')

-const build = function(opts) {
+const build = function (opts) {
  rollup
    .rollup({
      input: opts.input,
      plugins: (opts.plugins || []).concat([
-        json(),
        buble(),
        commonjs(),
        nodeResolve(),
@@ -25,7 +23,7 @@ const build = function(opts) {
        })
      ])
    })
-    .then(function(bundle) {
+    .then(function (bundle) {
      var dest = 'lib/' + (opts.output || opts.input)

      console.log(dest)
@@ -35,11 +33,11 @@ const build = function(opts) {
        strict: false
      })
    })
-    .catch(function(err) {
+    .catch(function (err) {
      console.error(err)
    })
 }
-const buildCore = function() {
+const buildCore = function () {
  build({
    input: 'src/core/index.js',
    output: 'docsify.js'
@@ -53,7 +51,7 @@ const buildCore = function() {
    })
  }
 }
-const buildAllPlugin = function() {
+const buildAllPlugin = function () {
  var plugins = [
    {name: 'search', input: 'search/index.js'},
    {name: 'ga', input: 'ga.js'},
@@ -1,6 +1,6 @@
 ![logo](_media/icon.svg)

-# docsify <small>4.8.0</small>
+# docsify <small>4.8.1</small>

 > A magical documentation site generator.

@@ -1,28 +1,28 @@
-* Getting started
+- Getting started

-  * [Quick start](quickstart.md)
-  * [Writing more pages](more-pages.md)
-  * [Custom navbar](custom-navbar.md)
-  * [Cover page](cover.md)
+  - [Quick start](quickstart.md)
+  - [Writing more pages](more-pages.md)
+  - [Custom navbar](custom-navbar.md)
+  - [Cover page](cover.md)

-* Customization
+- Customization

-  * [Configuration](configuration.md)
-  * [Themes](themes.md)
-  * [List of Plugins](plugins.md)
-  * [Write a Plugin](write-a-plugin.md)
-  * [Markdown configuration](markdown.md)
-  * [Language highlighting](language-highlight.md)
+  - [Configuration](configuration.md)
+  - [Themes](themes.md)
+  - [List of Plugins](plugins.md)
+  - [Write a Plugin](write-a-plugin.md)
+  - [Markdown configuration](markdown.md)
+  - [Language highlighting](language-highlight.md)

-* Guide
+- Guide

-  * [Deploy](deploy.md)
-  * [Helpers](helpers.md)
-  * [Vue compatibility](vue.md)
-  * [CDN](cdn.md)
-  * [Offline Mode(PWA)](pwa.md)
-  * [Server-Side Rendering(SSR)](ssr.md)
-  * [Embed Files <sup style="color:red">(new)<sup>](embed-files.md)
+  - [Deploy](deploy.md)
+  - [Helpers](helpers.md)
+  - [Vue compatibility](vue.md)
+  - [CDN](cdn.md)
+  - [Offline Mode(PWA)](pwa.md)
+  - [Server-Side Rendering(SSR)](ssr.md)
+  - [Embed Files](embed-files.md)

-* [Awesome docsify](awesome.md)
-* [Changelog](changelog.md)
+- [Awesome docsify](awesome.md)
+- [Changelog](changelog.md)
@@ -60,8 +60,6 @@ function isFn(obj) {
  return typeof obj === 'function'
 }

-var version = "4.7.1";
-
 function config () {
  var config = merge(
    {
@@ -126,7 +124,6 @@ function config () {
    }
  }

-  config.version = version;
  window.$docsify = config;

  return config
@@ -337,7 +334,7 @@ function corner(data) {
 /**
 * Render main content
 */
-function main$1(config) {
+function main(config) {
  var aside =
    '<button class="sidebar-toggle">' +
    '<div class="sidebar-toggle-button">' +
@@ -3245,7 +3242,8 @@ function getAndRemoveConfig(str) {

  if (str) {
    str = str
-      .replace(/^'|'$/, '')
+      .replace(/^'/, '')
+      .replace(/'$/, '')
      .replace(/:([\w-]+)=?([\w-]+)?/g, function (m, key, value) {
        config[key] = (value && value.replace(/&quot;/g, '')) || true;
        return ''
@@ -3503,6 +3501,8 @@ Compiler.prototype._initRenderer = function _initRenderer () {
      result = helper('tip', text);
    } else if (/^\?&gt;/.test(text)) {
      result = helper('warn', text);
+    } else if (/^</.test(text)) {
+      return text
    } else {
      result = "<p>" + text + "</p>";
    }
@@ -4154,12 +4154,12 @@ function renderMixin(proto) {
    scrollActiveSidebar(this.router);

    if (autoHeader && activeEl) {
-      var main = getNode('#main');
-      var firstNode = main.children[0];
+      var main$$1 = getNode('#main');
+      var firstNode = main$$1.children[0];
      if (firstNode && firstNode.tagName !== 'H1') {
        var h1 = create('h1');
        h1.innerText = activeEl.innerText;
-        before(main, h1);
+        before(main$$1, h1);
      }
    }

@@ -4286,7 +4286,7 @@ function initRender(vm) {
      }
    }

-    html += main$1(config);
+    html += main(config);
    // Render main app
    vm._renderTo(el, html, true);
  } else {
@@ -4952,7 +4952,7 @@ initGlobalAPI();
 /**
 * Version
 */
-Docsify.version = '4.8.0';
+Docsify.version = '4.8.1';

 /**
 * Run Docsify
@@ -1,6 +1,6 @@
 {
  "name": "docsify",
-  "version": "4.8.0",
+  "version": "4.8.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -6811,122 +6811,6 @@
        }
      }
    },
-    "rollup-plugin-json": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-json/-/rollup-plugin-json-3.1.0.tgz",
-      "integrity": "sha512-BlYk5VspvGpjz7lAwArVzBXR60JK+4EKtPkCHouAWg39obk9S61hZYJDBfMK+oitPdoe11i69TlxKlMQNFC/Uw==",
-      "dev": true,
-      "requires": {
-        "rollup-pluginutils": "^2.3.1"
-      },
-      "dependencies": {
-        "arr-diff": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.0.1"
-          }
-        },
-        "array-unique": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
-        },
-        "braces": {
-          "version": "1.8.5",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-          "dev": true,
-          "requires": {
-            "expand-range": "^1.8.1",
-            "preserve": "^0.2.0",
-            "repeat-element": "^1.1.2"
-          }
-        },
-        "estree-walker": {
-          "version": "0.5.2",
-          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.2.tgz",
-          "integrity": "sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==",
-          "dev": true
-        },
-        "expand-brackets": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-          "dev": true,
-          "requires": {
-            "is-posix-bracket": "^0.1.0"
-          }
-        },
-        "extglob": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        },
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        },
-        "micromatch": {
-          "version": "2.3.11",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^2.0.0",
-            "array-unique": "^0.2.1",
-            "braces": "^1.8.2",
-            "expand-brackets": "^0.1.4",
-            "extglob": "^0.3.1",
-            "filename-regex": "^2.0.0",
-            "is-extglob": "^1.0.0",
-            "is-glob": "^2.0.1",
-            "kind-of": "^3.0.2",
-            "normalize-path": "^2.0.1",
-            "object.omit": "^2.0.0",
-            "parse-glob": "^3.0.4",
-            "regex-cache": "^0.4.2"
-          }
-        },
-        "rollup-pluginutils": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz",
-          "integrity": "sha512-2XZwja7b6P5q4RZ5FhyX1+f46xi1Z3qBKigLRZ6VTZjwbN0K1IFGMlwm06Uu0Emcre2Z63l77nq/pzn+KxIEoA==",
-          "dev": true,
-          "requires": {
-            "estree-walker": "^0.5.2",
-            "micromatch": "^2.3.11"
-          }
-        }
-      }
-    },
    "rollup-plugin-node-resolve": {
      "version": "3.4.0",
      "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz",
@@ -1,6 +1,6 @@
 {
  "name": "docsify",
-  "version": "4.8.0",
+  "version": "4.8.1",
  "description": "A magical documentation generator.",
  "author": {
    "name": "qingwei-li",
@@ -45,7 +45,7 @@
    "marked": "^0.5.1",
    "medium-zoom": "^0.4.0",
    "opencollective": "^1.0.3",
-    "prismjs": "^1.9.0",
+    "prismjs": "^1.15.0",
    "tinydate": "^1.0.0",
    "tweezer.js": "^1.4.0"
  },
@@ -65,7 +65,6 @@
    "rollup-plugin-async": "^1.2.0",
    "rollup-plugin-buble": "^0.18.0",
    "rollup-plugin-commonjs": "^8.2.6",
-    "rollup-plugin-json": "^3.1.0",
    "rollup-plugin-node-resolve": "^3.0.0",
    "rollup-plugin-replace": "^2.0.0",
    "rollup-plugin-uglify": "^2.0.1",
@@ -37,5 +37,5 @@
      "integrity": "sha1-6DWIAbhrg7F1YNTjw4LXrvIQCUQ="
    }
  },
-  "version": "4.8.0"
+  "version": "4.8.1"
 }
@@ -1,6 +1,6 @@
 {
  "name": "docsify-server-renderer",
-  "version": "4.8.0",
+  "version": "4.8.1",
  "description": "docsify server renderer",
  "author": {
    "name": "qingwei-li",
@@ -16,6 +16,7 @@
  },
  "dependencies": {
    "debug": "^2.6.8",
+    "docsify": "^4.8.0",
    "node-fetch": "^1.7.0",
    "resolve-pathname": "^2.1.0"
  }
@@ -1,5 +1,4 @@
 import {merge, hyphenate, isPrimitive, hasOwn} from './util/core'
-import {version as pkgVersion} from './../../package.json'

 export default function () {
  const config = merge(
@@ -65,7 +64,6 @@ export default function () {
    }
  }

-  config.version = pkgVersion
  window.$docsify = config

  return config
@@ -14,7 +14,8 @@ export function getAndRemoveConfig(str = '') {

  if (str) {
    str = str
-      .replace(/^'|'$/, '')
+      .replace(/^'/, '')
+      .replace(/'$/, '')
      .replace(/:([\w-]+)=?([\w-]+)?/g, (m, key, value) => {
        config[key] = (value && value.replace(/&quot;/g, '')) || true
        return ''
@@ -260,6 +261,8 @@ export class Compiler {
        result = helperTpl('tip', text)
      } else if (/^\?&gt;/.test(text)) {
        result = helperTpl('warn', text)
+      } else if (/^</.test(text)) {
+        return text
      } else {
        result = `<p>${text}</p>`
      }
@@ -33,7 +33,7 @@ function walkFetchEmbed({embedTokens, compile, fetch}, cb) {
            ]
            embedToken.links = {}
          } else {
-            embedToken = [{type: 'html', text: text}]
+            embedToken = [{type: 'html', text}]
            embedToken.links = {}
          }
        }
Author	SHA1	Message	Date
qingwei.li	239eb3503b	chore: add changelog 4.8.1	2018-10-31 22:08:23 +08:00
qingwei.li	fce40eae25	[build] 4.8.1	2018-10-31 22:08:23 +08:00
qingwei.li	d35059dd0b	fix(compiler): prevent render of html code in paragraph, fixed #663	2018-10-31 22:05:24 +08:00
qingwei.li	4f588e0af4	fix(compiler): extra quotes for codeblock	2018-10-31 21:19:35 +08:00
qingwei.li	22ab7dfd14	chore(docs): remove new badege	2018-10-31 21:15:07 +08:00
qingwei.li	4805cb5322	feat: upgrade PrismJS, fixed #534	2018-10-31 21:14:25 +08:00
qingwei.li	2bc880d335	fix: ssr package dep, fixed #605	2018-10-31 21:11:06 +08:00