[release] 4.1.9

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+4.1.9 / 2017-05-31
+
+  * fix(lifecycle): continue to handle data
+  * fix: can't render toc on first load, fixed #171
+  * fix(render): broken name link, fixed #167
+
 ## 4.1.8(since 4.1.1) / 2017-05-31
 
   * fix(pure-css):add coverpage style, fixed #165

docs/README.md

@@ -17,6 +17,7 @@ See the [Quick start](quickstart.md) for more details.
 * Useful plugin API
 * Emoji support
 * Compatible with IE10+
+- Support SSR ([example](https://github.com/QingWei-Li/docsify-ssr-demo))
 
 ## Examples
 

docs/_coverpage.md

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

docs/de-de/README.md

@@ -17,6 +17,7 @@ Siehe [Schnellstart](de-de/quickstart.md) für weitere Informationen.
 * praktische API für Erweiterungen
 * Unterstützung für Emoji
 * Kompatibel mit IE10+
+- Support SSR ([example](https://github.com/QingWei-Li/docsify-ssr-demo))
 
 ## Beispiele
 

docs/zh-cn/README.md

@@ -18,6 +18,7 @@ docsify 是一个动态生成文档网站的工具。不同于 GitBook、Hexo
 - 丰富的 API
 - 支持 Emoji
 - 兼容 IE10+
+- 支持 SSR ([example](https://github.com/QingWei-Li/docsify-ssr-demo))
 
 ## 例子
 

lerna.json

@@ -0,0 +1,7 @@
+{
+  "lerna": "2.0.0-rc.5",
+  "packages": [
+    "packages/*"
+  ],
+  "version": "0.0.0"
+}

lib/docsify.js

@@ -126,23 +126,22 @@ function initLifecycle (vm) {
 function callHook (vm, hook, data, next) {
   if ( next === void 0 ) next = noop;
 
-  var newData = data;
   var queue = vm._hooks[hook];
 
   var step = function (index) {
     var hook = queue[index];
     if (index >= queue.length) {
-      next(newData);
+      next(data);
     } else {
       if (typeof hook === 'function') {
         if (hook.length === 2) {
           hook(data, function (result) {
-            newData = result;
+            data = result;
             step(index + 1);
           });
         } else {
           var result = hook(data);
-          newData = result !== undefined ? result : newData;
+          data = result !== undefined ? result : data;
           step(index + 1);
         }
       } else {
@@ -2797,8 +2796,8 @@ Compiler.prototype._initRenderer = function _initRenderer () {
   var ref = this;
     var linkTarget = ref.linkTarget;
     var router = ref.router;
-    var toc = ref.toc;
     var contentBase = ref.contentBase;
+  var _self = this;
   /**
    * render anchor tag
    * @link https://github.com/chjj/marked#overriding-renderer-methods
@@ -2821,7 +2820,7 @@ Compiler.prototype._initRenderer = function _initRenderer () {
     var slug = slugify(text);
     var url = router.toURL(router.getCurrentPath(), { id: slug });
     nextToc.slug = url;
-    toc.push(nextToc);
+    _self.toc.push(nextToc);
 
     return ("<h" + level + " id=\"" + slug + "\"><a href=\"" + url + "\" data-id=\"" + slug + "\" class=\"anchor\"><span>" + text + "</span></a></h" + level + ">")
   };
@@ -3288,6 +3287,7 @@ function initRender (vm) {
     // Polyfll
     cssVars(config.themeColor);
   }
+  vm._updateRender();
   toggleClass(body, 'ready');
 }
 
@@ -3544,7 +3544,6 @@ function initRouter (vm) {
 
   router.normalize();
   lastRoute = vm.route = router.parse();
-  vm._updateRender();
 
   router.onchange(function (_) {
     router.normalize();

lib/plugins/front-matter.js

@@ -498,6 +498,6 @@ var install = function (hook, vm) {
   });
 };
 
-window.$docsify.plugins = [].concat(install, window.$docsify.plugins);
+$docsify.plugins = [].concat(install, $docsify.plugins);
 
 }());

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify",
-  "version": "4.1.8",
+  "version": "4.1.9",
   "description": "A magical documentation generator.",
   "author": {
     "name": "qingwei-li",
@@ -20,6 +20,7 @@
     "themes"
   ],
   "scripts": {
+    "bootstrap": "npm i && lerna bootstrap",
     "build": "rm -rf lib themes && node build/build && mkdir lib/themes && mkdir themes && node build/build-css && npm run build:ssr && node build/build-cover",
     "dev:build": "rm -rf lib themes && mkdir themes && node build/build --dev && node build/build-css --dev",
     "dev": "node app & nodemon -w src -e js,css --exec 'npm run dev:build'",
@@ -39,6 +40,7 @@
     "eslint": "^3.18.0",
     "eslint-config-vue": "^2.0.2",
     "eslint-plugin-vue": "^2.0.1",
+    "lerna": "^2.0.0-rc.5",
     "nodemon": "^1.11.0",
     "postcss": "^5.2.16",
     "postcss-salad": "^1.0.8",

src/core/init/lifecycle.js

@@ -19,23 +19,22 @@ export function initLifecycle (vm) {
 }
 
 export function callHook (vm, hook, data, next = noop) {
-  let newData = data
   const queue = vm._hooks[hook]
 
   const step = function (index) {
     const hook = queue[index]
     if (index >= queue.length) {
-      next(newData)
+      next(data)
     } else {
       if (typeof hook === 'function') {
         if (hook.length === 2) {
           hook(data, result => {
-            newData = result
+            data = result
             step(index + 1)
           })
         } else {
           const result = hook(data)
-          newData = result !== undefined ? result : newData
+          data = result !== undefined ? result : data
           step(index + 1)
         }
       } else {

src/core/render/compiler.js

@@ -44,7 +44,8 @@ export class Compiler {
 
   _initRenderer () {
     const renderer = new marked.Renderer()
-    const { linkTarget, router, toc, contentBase } = this
+    const { linkTarget, router, contentBase } = this
+    const _self = this
     /**
      * render anchor tag
      * @link https://github.com/chjj/marked#overriding-renderer-methods
@@ -67,7 +68,7 @@ export class Compiler {
       const slug = slugify(text)
       const url = router.toURL(router.getCurrentPath(), { id: slug })
       nextToc.slug = url
-      toc.push(nextToc)
+      _self.toc.push(nextToc)
 
       return `<h${level} id="${slug}"><a href="${url}" data-id="${slug}" class="anchor"><span>${text}</span></a></h${level}>`
     }

src/core/render/index.js

@@ -208,5 +208,6 @@ export function initRender (vm) {
     // Polyfll
     cssVars(config.themeColor)
   }
+  vm._updateRender()
   dom.toggleClass(dom.body, 'ready')
 }

src/core/router/index.js

@@ -23,7 +23,6 @@ export function initRouter (vm) {
 
   router.normalize()
   lastRoute = vm.route = router.parse()
-  vm._updateRender()
 
   router.onchange(_ => {
     router.normalize()

src/plugins/front-matter/index.js

@@ -10,4 +10,4 @@ const install = function (hook, vm) {
   })
 }
 
-window.$docsify.plugins = [].concat(install, window.$docsify.plugins)
+$docsify.plugins = [].concat(install, $docsify.plugins)