diff --git a/CHANGELOG.md b/CHANGELOG.md index 80eeb1b88..d54c3dbd4 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/build/build-ssr.js b/build/build-ssr.js index b21b4ce71..258738957 100644 --- a/build/build-ssr.js +++ b/build/build-ssr.js @@ -1,12 +1,21 @@ var rollup = require('rollup') -var async = require('rollup-plugin-async') +var babel = require('rollup-plugin-babel') var isProd = process.argv[process.argv.length - 1] !== '--dev' rollup .rollup({ entry: 'packages/docsify-server-renderer/index.js', plugins: [ - async() + babel({ + presets: [ + [ + 'es2015', + { + modules: false + } + ] + ] + }) ], onwarn: function() {} }) diff --git a/docs/_sidebar.md b/docs/_sidebar.md index b4b3ebd98..0fa0428d5 100644 --- a/docs/_sidebar.md +++ b/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) diff --git a/docs/de-de/ssr.md b/docs/de-de/ssr.md index ab5179359..7bb909750 100644 --- a/docs/de-de/ssr.md +++ b/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. diff --git a/docs/index.html b/docs/index.html index 2113a1f12..703bfb8ae 100644 --- a/docs/index.html +++ b/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 @@ ] } - - + + diff --git a/docs/ssr.html b/docs/ssr.html index fec852886..739595acc 100644 --- a/docs/ssr.html +++ b/docs/ssr.html @@ -7,10 +7,10 @@ - - - - + + + +