[release] 4.1.6

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 4.1.0 / 2017-05-30
+## 4.1.0 / 2017-05-30 🎂 for me
 
 
   * feat: Support server client renderer [See detail](//docsify.js.org/#/ssr)

README.md

@@ -27,6 +27,7 @@
 - Multiple themes
 - Useful plugin API
 - Compatible with IE10+
+- Support SSR
 
 ## Quick start
 

build/build-ssr.js

@@ -1,4 +1,5 @@
 var rollup = require('rollup')
+var buble = require('rollup-plugin-buble')
 var async = require('rollup-plugin-async')
 var isProd = process.argv[process.argv.length - 1] !== '--dev'
 
@@ -6,7 +7,12 @@ rollup
   .rollup({
     entry: 'packages/docsify-server-renderer/index.js',
     plugins: [
-      async()
+      async(),
+      buble({
+        transforms: {
+          generator: false
+        }
+      })
     ],
     onwarn: function() {}
   })

docs/_sidebar.md

@@ -18,6 +18,6 @@
   - [Vue compatibility](vue.md)
   - [CDN](cdn.md)
   - [Offline Mode(PWA)](pwa.md)
-  - [(Server-client renderer(SSR)](ssr.md)
+  - [Server-client renderer(SSR)](ssr.md)
 
 - [Changelog](changelog.md)

docs/de-de/ssr.md

@@ -15,13 +15,13 @@ npm i now -g
 npm i docsify-cli -D
 ```
 
-Edit `package.json`. If the documentation in `./docs` subdirectory.
+ Edit `package.json`. If the documentation in `./docs` subdirectory.
 
 ```json
 {
   "name": "my-project",
   "scripts": {
-    "start": "docsify start docs"
+    "start": "docsify start ."
   },
   "files": [
     "docs"
@@ -38,6 +38,9 @@ Edit `package.json`. If the documentation in `./docs` subdirectory.
 }
 ```
 
+ Remove `index.html`
+
+
 !> The `basePath` just like webpack `publicPath`. You should config it if your docs is in the subdirectory.
 
 We can preview in the local to see if it works.
@@ -91,7 +94,7 @@ You can configure it in a special config file, or `package.json`.
 
 ```js
 module.exports = {
-  tempate: './ssr.html',
+  template: './ssr.html',
   config: {
    // docsify config
   }

docs/index.html

@@ -36,8 +36,6 @@
     maxLevel: 4,
     subMaxLevel: 2,
     name: 'docsify',
-    // basePath: '/docs/',
-    routerMode: 'history',
     search: {
       noData: {
         '/de-de/': 'Keine Ergebnisse!',
@@ -61,8 +59,8 @@
     ]
   }
 </script>
-<script src="//unpkg.com/docsify@next/lib/docsify.min.js"></script>
-<script src="//unpkg.com/docsify@next/lib/plugins/search.min.js"></script>
+<script src="//unpkg.com/docsify/lib/docsify.min.js"></script>
+<script src="//unpkg.com/docsify/lib/plugins/search.min.js"></script>
 <script src="//unpkg.com/prismjs/components/prism-bash.min.js"></script>
 <script src="//unpkg.com/prismjs/components/prism-markdown.min.js"></script>
 <script src="//unpkg.com/prismjs/components/prism-nginx.min.js"></script>

docs/ssr.html

@@ -7,10 +7,10 @@
   <meta name="keywords" content="doc,docs,documentation,gitbook,creator,generator,github,jekyll,github-pages">
   <meta name="description" content="A magical documentation generator.">
   <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-  <link rel="stylesheet" href="/themes/vue.css" title="vue">
-  <!-- <link rel="stylesheet" href="//unpkg.com/docsify@next/lib/themes/dark.css" title="dark" disabled> -->
-  <!-- <link rel="stylesheet" href="//unpkg.com/docsify@next/lib/themes/buble.css" title="buble" disabled> -->
-  <!-- <link rel="stylesheet" href="//unpkg.com/docsify@next/lib/themes/pure.css" title="pure" disabled> -->
+  <link rel="stylesheet" href="//unpkg.com/docsify/lib/themes/vue.css" title="vue">
+  <link rel="stylesheet" href="//unpkg.com/docsify/lib/themes/dark.css" title="dark" disabled>
+  <link rel="stylesheet" href="//unpkg.com/docsify/lib/themes/buble.css" title="buble" disabled>
+  <link rel="stylesheet" href="//unpkg.com/docsify/lib/themes/pure.css" title="pure" disabled>
   <style>
     nav.app-nav li ul {
       min-width: 100px;
@@ -21,8 +21,8 @@
   <!--inject-app-->
   <!--inject-config-->
 </body>
-<script src="/lib/docsify.js"></script>
-<!-- <script src="/lib/plugins/search.js"></script> -->
+<script src="//unpkg.com/docsify/lib/docsify.min.js"></script>
+<script src="//unpkg.com/docsify/lib/plugins/search.min.js"></script>
 <script src="//unpkg.com/prismjs/components/prism-bash.min.js"></script>
 <script src="//unpkg.com/prismjs/components/prism-markdown.min.js"></script>
 <script src="//unpkg.com/prismjs/components/prism-nginx.min.js"></script>

docs/ssr.md

@@ -21,7 +21,7 @@ Edit `package.json`. If the documentation in `./docs` subdirectory.
 {
   "name": "my-project",
   "scripts": {
-    "start": "docsify start docs"
+    "start": "docsify start ."
   },
   "files": [
     "docs"
@@ -38,6 +38,8 @@ Edit `package.json`. If the documentation in `./docs` subdirectory.
 }
 ```
 
+Remove `index.html`
+
 !> The `basePath` just like webpack `publicPath`. You should config it if your docs is in the subdirectory.
 
 We can preview in the local to see if it works.
@@ -91,7 +93,7 @@ You can configure it in a special config file, or `package.json`.
 
 ```js
 module.exports = {
-  tempate: './ssr.html',
+  template: './ssr.html',
   config: {
    // docsify config
   }

docs/zh-cn/ssr.md

@@ -15,13 +15,13 @@ npm i now -g
 npm i docsify-cli -D
 ```
 
-Edit `package.json`. If the documentation in `./docs` subdirectory.
+2. Edit `package.json`. If the documentation in `./docs` subdirectory.
 
 ```json
 {
   "name": "my-project",
   "scripts": {
-    "start": "docsify start docs"
+    "start": "docsify start ."
   },
   "files": [
     "docs"
@@ -38,6 +38,9 @@ Edit `package.json`. If the documentation in `./docs` subdirectory.
 }
 ```
 
+
+Remove `index.html`
+
 !> The `basePath` just like webpack `publicPath`. You should config it if your docs is in the subdirectory.
 
 We can preview in the local to see if it works.
@@ -91,7 +94,7 @@ You can configure it in a special config file, or `package.json`.
 
 ```js
 module.exports = {
-  tempate: './ssr.html',
+  template: './ssr.html',
   config: {
    // docsify config
   }

lib/docsify.js

@@ -2741,7 +2741,7 @@ function getPath () {
 }
 
 var isAbsolutePath = cached(function (path) {
-  return /(:|(\/{2}))/.test(path)
+  return /(:|(\/{2}))/g.test(path)
 });
 
 var getParentPath = cached(function (path) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify",
-  "version": "4.1.0",
+  "version": "4.1.6",
   "description": "A magical documentation generator.",
   "author": {
     "name": "qingwei-li",

packages/docsify-server-renderer/index.js

@@ -5,6 +5,8 @@ import { Compiler } from '../../src/core/render/compiler'
 import { isAbsolutePath } from '../../src/core/router/util'
 import { readFileSync } from 'fs'
 import { resolve, basename } from 'path'
+import resolvePathname from 'resolve-pathname'
+import debug from 'debug'
 
 function cwd (...args) {
   return resolve(process.cwd(), ...args)
@@ -111,10 +113,12 @@ export default class Renderer {
   }
 
   async _loadFile (filePath) {
+    debug('docsify')(`load > ${filePath}`)
     let content
     try {
       if (isAbsolutePath(filePath)) {
         const res = await fetch(filePath)
+        if (!res.ok) throw Error()
         content = await res.text()
         this.lock = 0
       } else {
@@ -131,7 +135,7 @@ export default class Renderer {
 
       const fileName = basename(filePath)
 
-      return await this._loadFile(cwd(filePath, '../..', fileName))
+      return await this._loadFile(resolvePathname(`../${fileName}`, filePath))
     }
   }
 }

packages/docsify-server-renderer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify-server-renderer",
-  "version": "4.1.0",
+  "version": "4.1.6",
   "description": "docsify server renderer",
   "author": {
     "name": "qingwei-li",
@@ -15,6 +15,8 @@
     "test": "echo 'hello'"
   },
   "dependencies": {
-    "node-fetch": "^1.7.0"
+    "debug": "^2.6.8",
+    "node-fetch": "^1.7.0",
+    "resolve-pathname": "^2.1.0"
   }
 }

src/core/router/util.js

@@ -36,7 +36,7 @@ export function getPath (...args) {
 }
 
 export const isAbsolutePath = cached(path => {
-  return /(:|(\/{2}))/.test(path)
+  return /(:|(\/{2}))/g.test(path)
 })
 
 export const getParentPath = cached(path => {