[release] 4.1.6

README.md

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

build/build-ssr.js

@@ -1,21 +1,17 @@
 var rollup = require('rollup')
-var babel = require('rollup-plugin-babel')
+var buble = require('rollup-plugin-buble')
+var async = require('rollup-plugin-async')
 var isProd = process.argv[process.argv.length - 1] !== '--dev'
 
 rollup
   .rollup({
     entry: 'packages/docsify-server-renderer/index.js',
     plugins: [
-      babel({
-        plugins: ['transform-async-to-generator'],
-        presets: [
-          [
-            'es2015',
-            {
-              modules: false
-            }
-          ]
-        ]
+      async(),
+      buble({
+        transforms: {
+          generator: false
+        }
       })
     ],
     onwarn: function() {}

docs/de-de/ssr.md

@@ -94,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/ssr.md

@@ -93,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

@@ -94,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.2",
+  "version": "4.1.6",
   "description": "A magical documentation generator.",
   "author": {
     "name": "qingwei-li",
@@ -35,8 +35,6 @@
     "zoom-image": "^0.1.4"
   },
   "devDependencies": {
-    "babel-plugin-transform-async-to-generator": "^6.24.1",
-    "babel-preset-es2015": "^6.24.1",
     "cssnano": "^3.10.0",
     "eslint": "^3.18.0",
     "eslint-config-vue": "^2.0.2",
@@ -45,7 +43,7 @@
     "postcss": "^5.2.16",
     "postcss-salad": "^1.0.8",
     "rollup": "^0.41.6",
-    "rollup-plugin-babel": "^2.7.1",
+    "rollup-plugin-async": "^1.2.0",
     "rollup-plugin-buble": "^0.15.0",
     "rollup-plugin-commonjs": "^8.0.2",
     "rollup-plugin-node-resolve": "^2.0.0",

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.2",
+  "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 => {