[release] 4.0.1 next

* Add newline before appended content

* Also add new line to dev page

.eslintignore

@@ -0,0 +1,3 @@
+.git/
+packages/docsify-server-renderer/build.js
+node_modules

.eslintrc

@@ -1,5 +1,10 @@
 {
-  "extends": ["vue"],
+  "extends": [
+    "vue"
+  ],
+  "parserOptions": {
+      "ecmaVersion": 8
+    },
   "env": {
     "browser": true
   },

.gitignore

@@ -1,4 +1,4 @@
-.DS_Store
 *.log
+.DS_Store
+/themes
 node_modules
-/themes

.npmignore

@@ -0,0 +1,5 @@
+.eslintignore
+.eslintrc
+.github/
+.gitignore
+.travis.yml

.travis.yml

@@ -1,6 +1,9 @@
 sudo: false
 cache:
   directories:
-  - $HOME/.yarn-cache
+    - $HOME/.yarn-cache
 language: node_js
 node_js: stable
+os:
+  - linux
+  - osx

CHANGELOG.md

@@ -1,86 +1,154 @@
+# Changelog
 
-# 3.4.3 / 2017-03-16
-==================
+## 3.7.3 / 2017-05-22
+
+  * fix(render): find => filter, Compatible with old browser
+  * Pretty dir tree
+
+## 3.7.2 / 2017-05-19
+
+  * tweaks
+
+## 3.7.1 / 2017-05-19
+
+  * fix: docsify-updated is undefined
+
+## 3.7.0 / 2017-05-16
+
+  * feat: add externalLinkTarget, close ([#149](https://github.com/QingWei-Li/docsify/issues/149)
+  * feat: add **{docsify-updated<span>}</span>**, close ([#158](https://github.com/QingWei-Li/docsify/issues/158)
+
+## 3.6.6 / 2017-05-06
+
+  * feat: support query string for the search, likes `https://docsify.js.org/#/?s=navbar`, fixed ([#156](https://github.com/QingWei-Li/docsify/issues/156)
+
+## 3.6.5 / 2017-04-28
+
+  * fix(util): fix crash, fixed ([#154](https://github.com/QingWei-Li/docsify/issues/154)
+
+## 3.6.4 / 2017-04-28
+
+  * fix(util): correctly clean up duplicate slashes, fixed ([#153](https://github.com/QingWei-Li/docsify/issues/153)
+
+## 3.6.3 / 2017-04-25
+
+  * fix(external-script): script attrs
+
+## 3.6.2/ 2017-04-12
+
+  * feat(external-script): detect more than one script dom, fixed ([#146](https://github.com/QingWei-Li/docsify/issues/146)
+  * GA: Send hash instead of complete href ([#147](https://github.com/QingWei-Li/docsify/issues/147)
+
+## 3.6.1 / 2017-04-09
+
+  * feat(event): Collapse the sidebar when click outside element in the small screen
+
+## 3.6.0 / 2017-04-09
+
+  * feat(render): add mergeNavbar option, close ([#125](https://github.com/QingWei-Li/docsify/issues/125)
+
+## 3.5.2/ 2017-04-05
+
+  * add optional current route param to toURL and use it to properly compose local anchor links
+  * fix code style by removing semicolons
+  * in toURL test for anchor links and if so prepend the currentPath to the generated path. fixes ([#142](https://github.com/QingWei-Li/docsify/issues/142))
+
+## 3.5.1 / 2017-03-25
+
+  * fix: .md file extension regex
+
+## 3.5.0 / 2017-03-25
+
+  * feat(route): auto remove .md extension
+  * fix: adjust display on small screens [@jrappen](https://github.com/jrappen)
+  * fix: navbar labels for German [@jrappen](https://github.com/jrappen)
+
+## 3.4.4 / 2017-03-17
+
+  * fix(search): fix input style
+  * fix search plugin match bug
+
+## 3.4.3 / 2017-03-16
 
   * Add ability to ignore headers when generating toc ([#127](https://github.com/QingWei-Li/docsify/issues/127) [@christopherwk210](https://github.com/christopherwk210))
   * fix external-script not inserting script at right place [@Leopoldthecoder](https://github.com/Leopoldthecoder)
   * add German docs [@jrappen](https://github.com/jrappen)
 
-# 3.4.2 / 2017-03-11
+## 3.4.2 / 2017-03-11
 
 * feat(emojify): add no-emoji option
 
-# 3.4.1 / 2017-03-10
+## 3.4.1 / 2017-03-10
 
 * fix(dom): Disable the dom cache when vue is present, fixed [#119](https://github.com/QingWei-Li/docsify/issues/119)
 * update english docs, [@jrappen](https://github.com/jrappen)
 
-# 3.4.0 / 2017-03-09
+## 3.4.0 / 2017-03-09
 
 * feat(zoom-image): add plugin
 
-# 3.3.0 / 2017-03-07
+## 3.3.0 / 2017-03-07
 
 * add front-matter plugin
 * add external-script plugin, [@Leopoldthecoder](https://github.com/Leopoldthecoder)
 * Fix nav showing while loading ([#112](https://github.com/QingWei-Li/docsify/issues/112))
 
-# 3.2.0 / 2017-02-28
+## 3.2.0 / 2017-02-28
 
 * fix(render): Toc rendering error, fixed [#106](https://github.com/QingWei-Li/docsify/issues/106)
 * feat(search): Localization for no data tip, close [#103](https://github.com/QingWei-Li/docsify/issues/103)
 * fix(fetch): load sidebar and navbar for parent path, fixed [#100](https://github.com/QingWei-Li/docsify/issues/100)
 * feat(render) nameLink for each route, fixed [#99](https://github.com/QingWei-Li/docsify/issues/99)
 
-# 3.1.2 / 2017-02-27
+## 3.1.2 / 2017-02-27
 
 * fix(search): dont search nameLink, fixed [#102](https://github.com/QingWei-Li/docsify/issues/102)
 
-# 3.1.1 / 2017-02-24
+## 3.1.1 / 2017-02-24
 
 * fix(search): dont search nameLink, fixed [#102](https://github.com/QingWei-Li/docsify/issues/102)
 * fix(render): custom cover background image
 * fix(tpl): extra character, fixed [#101](https://github.com/QingWei-Li/docsify/issues/101)
 
-# 3.1.0 / 2017-02-22
+## 3.1.0 / 2017-02-22
 
 * fix(search): incorrect anchor link, fixed [#90](https://github.com/QingWei-Li/docsify/issues/90)
 * feat(emoji): add emoji plugin
 
-# 3.0.5 / 2017-02-21
+## 3.0.5 / 2017-02-21
 
 * feat(pwa): add sw.js
 * fix(layout.css): loading style
 * fix(event): highlight sidebar when clicked, fixed [#86](https://github.com/QingWei-Li/docsify/issues/86)
 * fix(gen-tree): cache toc list, fixed [#88](https://github.com/QingWei-Li/docsify/issues/88)
 
-# 3.0.4 / 2017-02-20
+## 3.0.4 / 2017-02-20
 
 * fix(render): execute script
 * fix(render): disable rendering sub list when loadSidebar is false
 
-# 3.0.3 / 2017-02-19
+## 3.0.3 / 2017-02-19
 
 * fixed look of links in blockquote
 * fix(scroll) highlight bug
 
-# 3.0.2 / 2017-02-19
+## 3.0.2 / 2017-02-19
 
 * fix(search): add lazy input
 * fix(compiler): link
 
-# 3.0.1 / 2017-02-19
+## 3.0.1 / 2017-02-19
 
 * fix(route): empty alias
 
-# 3.0.0 / 2017-02-19
+## 3.0.0 / 2017-02-19
 
-#### Breaking change
+##### Breaking change
 
 * Not support IE9
 * The route becomes: `/#/page?id=slug`. The previous route will be redirected
 
-#### Features
+##### Features
 
 * Faster rendering
 * Clearer source code

README.md

@@ -64,6 +64,9 @@ These open-source projects are using docsify to generate their sites. Pull reque
 | [Vudash](http://vudash.github.io/vudash/) | Powerful, Flexible, Open Source dashboards for anything |
 | [Trilogy](http://trilogy.js.org) | No-hassle SQLite with a Promise-based, document store style API. |
 | [Mybatis-Plus](http://mp.baomidou.com/) | An enhanced toolkit of Mybatis to simplify development |
+| [JS MythBusters](https://mythbusters.js.org) | An optimization handbook from a high level point of view. |
+| [hire-me](https://fvcproductions.github.io/hire-me) | A path to getting an awesome tech gig. |
+| [vue-amap](https://elemefe.github.io/vue-amap/) | A Map Component Library Base on Vue 2.x and Gaode Map. |
 
 ## Similar projects
 

app.js

@@ -1,12 +1,51 @@
 var serveStatic = require('serve-static')
 var http = require('http')
 var fs = require('fs')
+var Renderer = require('./packages/docsify-server-renderer/build.js')
+
+var renderer = new Renderer({
+  template: `
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>docsify</title>
+  <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">
+</head>
+<body>
+  <!--inject-app-->
+  <!--inject-config-->
+<script src="/lib/docsify.js"></script>
+</body>
+</html>`,
+  config: {
+    name: 'docsify',
+    repo: 'qingwei-li/docsify',
+    basePath: 'https://docsify.js.org/',
+    loadNavbar: true,
+    loadSidebar: true,
+    subMaxLevel: 3,
+    auto2top: true,
+    alias: {
+      '/de-de/changelog': '/changelog',
+      '/zh-cn/changelog': '/changelog',
+      '/changelog': 'https://raw.githubusercontent.com/QingWei-Li/docsify/master/CHANGELOG'
+    }
+  },
+  path: './'
+})
 
 http.createServer(function (req, res) {
   serveStatic('.')(req, res, function () {
+    // TEST SSR
+    // renderer.renderToString(req.url)
+      // .then(html => res.end(html))
+
     res.writeHead(404, { 'Content-Type': 'text/html' })
     res.end(fs.readFileSync('dev.html'))
   })
 }).listen(3000, '0.0.0.0')
 
 console.log(`\nListening at http://0.0.0.0:3000\n`)
+

build/build-ssr.js

@@ -0,0 +1,24 @@
+var rollup = require('rollup')
+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: [
+      async()
+    ],
+    onwarn: function() {}
+  })
+  .then(function (bundle) {
+    var dest = 'packages/docsify-server-renderer/build.js'
+
+    console.log(dest)
+    bundle.write({
+      format: 'cjs',
+      dest: dest
+    })
+  })
+  .catch(function (err) {
+    console.error(err)
+  })

build/release.sh

@@ -0,0 +1,43 @@
+set -e
+
+if [[ -z $1 ]]; then
+  echo "Enter new version: "
+  read VERSION
+else
+  VERSION=$1
+fi
+
+read -p "Releasing $VERSION $RELEASE_TAG - are you sure? (y/n) " -n 1 -r
+echo
+if [[ $REPLY =~ ^[Yy]$ ]]; then
+  echo "Releasing $VERSION ..."
+
+  npm run test
+
+  # build
+  VERSION=$VERSION npm run build
+
+  # update packages
+  cd packages/docsify-server-renderer
+  npm version $VERSION
+  if [[ -z $RELEASE_TAG ]]; then
+    npm publish
+  else
+    npm publish --tag $RELEASE_TAG
+  fi
+  cd -
+
+  # commit
+  git add -A
+  git commit -m "[build] $VERSION $RELEASE_TAG"
+  npm version $VERSION --message "[release] $VERSION $RELEASE_TAG"
+
+  # publish
+  git push origin refs/tags/v$VERSION
+  git push
+  if [[ -z $RELEASE_TAG ]]; then
+    npm publish
+  else
+    npm publish --tag $RELEASE_TAG
+  fi
+fi

dev.html

@@ -23,15 +23,24 @@
       '/zh-cn/changelog': '/changelog',
       '/changelog': 'https://raw.githubusercontent.com/QingWei-Li/docsify/master/CHANGELOG'
     },
+    auto2top: true,
+    basePath: '/docs/',
+    executeScript: true,
     loadNavbar: true,
-    executeScript: true
+    loadSidebar: true,
+    name: 'docsify',
+    subMaxLevel: 2,
+    mergeNavbar: true,
+    formatUpdated: '{MM}/{DD} {HH}:{mm}',
+    routerMode: 'history',
+    plugins: [
+      function(hook) {
+        hook.beforeEach(function (html) {
+          return html += '\n> Last modified {docsify-updated}'
+        })
+      }
+    ]
   }
 </script>
-<script
-  src="/lib/docsify.js"
-  data-name="docsify"
-  data-base-path="/docs/"
-  data-load-sidebar
-  data-sub-max-level="2"
-  data-auto2top></script>
+<script src="/lib/docsify.js"></script>
 </html>

docs/README.md

@@ -4,9 +4,9 @@
 
 ## What is it
 
-docsify generates your documentation website on the fly. Unlike GitBook, it does not generate static html files. Instead, it smartly loads and parses your Markdown files and displays them as website. All you need to do is create an `index.html` to start and [deploy it on GitHub Pages](/deploy).
+docsify generates your documentation website on the fly. Unlike GitBook, it does not generate static html files. Instead, it smartly loads and parses your Markdown files and displays them as website. All you need to do is create an `index.html` to start and [deploy it on GitHub Pages](deploy.md).
 
-See the [Quick start](/quickstart) for more details.
+See the [Quick start](quickstart.md) for more details.
 
 ## Features
 

docs/_coverpage.md

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

docs/_navbar.md

@@ -1,4 +1,4 @@
-- :uk:
- - [:cn: 中文](/zh-cn/)
- - [:de: German](/de-de/)
- - [:uk: English](/)
+- Translations
+  - [:cn: 中文](/zh-cn/)
+  - [:de: Deutsch](/de-de/)
+  - [:uk: English](/)

docs/_sidebar.md

@@ -1,22 +1,22 @@
 - Getting started
-  - [Quick start](/quickstart)
-  - [Writing more pages](/more-pages)
-  - [Custom navbar](/custom-navbar)
-  - [Cover page](/cover)
+  - [Quick start](quickstart.md)
+  - [Writing more pages](more-pages.md)
+  - [Custom navbar](custom-navbar.md)
+  - [Cover page](cover.md)
 
 - Customization
-  - [Configuration](/configuration)
-  - [Themes](/themes)
-  - [List of Plugins](/plugins)
-  - [Write a Plugin](/write-a-plugin)
-  - [Markdown configuration](/markdown)
-  - [Language highlighting](/language-highlight)
+  - [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
-  - [Deploy](/deploy)
-  - [Helpers](/helpers)
-  - [Vue compatibility](/vue)
-  - [CDN](/cdn)
-  - [Offline Mode(PWA)](/pwa)
+  - [Deploy](deploy.md)
+  - [Helpers](helpers.md)
+  - [Vue compatibility](vue.md)
+  - [CDN](cdn.md)
+  - [Offline Mode(PWA)](pwa.md)
 
-- [Changelog](/changelog)
+- [Changelog](changelog.md)

docs/cdn.md

@@ -44,4 +44,7 @@ Alternatively, use [compressed files](#compressed-files).
 
 ## Other CDN
 
-[jsDelivr](http://www.jsdelivr.com/projects/docsify) is available.
+- http://www.bootcdn.cn/docsify
+- http://www.jsdelivr.com/projects/docsify
+- https://cdnjs.com/libraries/docsify
+

docs/configuration.md

@@ -166,7 +166,7 @@ window.$docsify = {
 - Type: `Boolean|String`
 - Default: `false`
 
-Activate the [cover feature](/cover). If true, it will load from `_coverpage.md`.
+Activate the [cover feature](cover.md). If true, it will load from `_coverpage.md`.
 
 ```js
 window.$docsify = {
@@ -212,7 +212,7 @@ window.$docsify = {
 
 - Type: `Function`
 
-See [Markdown configuration](/markdown).
+See [Markdown configuration](markdown.md).
 
 ```js
 window.$docsify = {
@@ -294,7 +294,7 @@ window.$docsify = {
 </script>
 ```
 
-Note that if you are running an external script, e.g. an embedded jsfiddle demo, make sure to include the [external-script](plugins?id=external-script) plugin.
+Note that if you are running an external script, e.g. an embedded jsfiddle demo, make sure to include the [external-script](plugins.md?id=external-script) plugin.
 
 ## no-emoji
 
@@ -305,3 +305,38 @@ window.$docsify = {
   noEmoji: true
 }
 ```
+
+## merge-navbar
+
+Navbar will be merged with the sidebar on smaller screens.
+
+```js
+window.$docsify = {
+  mergeNavbar: true
+}
+```
+
+## format-updated
+We can display the file update date through **{docsify-updated<span>}</span>** variable. And format it by `formatUpdated`. 
+See https://github.com/lukeed/tinydate#patterns
+```js
+window.$docsify = {
+  formatUpdated: '{MM}/{DD} {HH}:{mm}',
+
+  formatUpdated: function (time) {
+    // ...
+
+    return time
+  }
+}
+```
+
+## external-link-target
+
+Currently it defaults to _blank, would be nice if configurable:
+
+```js
+window.$docsify = {
+  externalLinkTarget: '_self' // default: '_blank'
+}
+```

docs/cover.md

@@ -1,6 +1,6 @@
 # Cover
 
-Activate the cover feature by setting `coverpage` to **true**, compare [coverpage configuration](configuration#coverpage).
+Activate the cover feature by setting `coverpage` to **true**, compare [coverpage configuration](configuration.md#coverpage).
 
 ## Basic usage
 

docs/custom-navbar.md

@@ -20,7 +20,7 @@ If you need custom navigation, you can create a HTML-based navigation bar.
 
 ## Markdown
 
-Alternatively, you can create a custom markdown-based navigation file by setting `loadNavbar` to **true** and creating `_navbar.md`, compare [load-navbar configuration](configuration#load-navbar).
+Alternatively, you can create a custom markdown-based navigation file by setting `loadNavbar` to **true** and creating `_navbar.md`, compare [load-navbar configuration](configuration.md#load-navbar).
 
 ```html
 <!-- index.html -->
@@ -52,17 +52,17 @@ You can create sub-lists by indenting items that are under a certain parent.
 <!-- _navbar.md -->
 
 - Getting started
-  - [Quick start](/quickstart)
-  - [Writing more pages](/more-pages)
-  - [Custom navbar](/custom-navbar)
-  - [Cover page](/cover)
+  - [Quick start](quickstart.md)
+  - [Writing more pages](more-pages.md)
+  - [Custom navbar](custom-navbar.md)
+  - [Cover page](cover.md)
 
 - Configuration
-  - [Configuration](/configuration)
-  - [Themes](/themes)
-  - [Using plugins](/plugins)
-  - [Markdown configuration](/markdown)
-  - [Language highlight](/language-highlight)
+  - [Configuration](configuration.md)
+  - [Themes](themes.md)
+  - [Using plugins](plugins.md)
+  - [Markdown configuration](markdown.md)
+  - [Language highlight](language-highlight.md)
 ```
 
 renders as

docs/de-de/README.md

@@ -4,9 +4,9 @@
 
 ## Was ist das
 
-**docsify** generiert deine Dokumentationswebseite zeitgleich (mit der Darstellung). Im Gegensatz zu GitBook, werden keine statischen HTML Seiten generiert. Stattdessen, werden im Hintergrund Markdown Dateien geladen und umgewandelt, und als Webseite dargestellt. Alles, was du brauchst, ist eine Datei namens `index.html`, um sie über [GitHub Pages zu veröffentlichen](/de-de/deploy).
+**docsify** generiert deine Dokumentationswebseite zeitgleich (mit der Darstellung). Im Gegensatz zu GitBook, werden keine statischen HTML Seiten generiert. Stattdessen, werden im Hintergrund Markdown Dateien geladen und umgewandelt, und als Webseite dargestellt. Alles, was du brauchst, ist eine Datei namens `index.html`, um sie über [GitHub Pages zu veröffentlichen](de-de/deploy.md).
 
-Siehe [Schnellstart](/de-de/quickstart) für weitere Informationen.
+Siehe [Schnellstart](de-de/quickstart.md) für weitere Informationen.
 
 ## Features
 

docs/de-de/_navbar.md

@@ -1,4 +0,0 @@
-- :de:
- - [:cn: 中文](/zh-cn/)
- - [:de: German](/de-de/)
- - [:uk: English](/)

docs/de-de/_sidebar.md

@@ -1,22 +1,22 @@
 - Loslegen
-  - [Schnellstart](/de-de/quickstart)
-  - [Schreiben weiterer Seiten](/de-de/more-pages)
-  - [Navigationsleiste anpassen](/de-de/custom-navbar)
-  - [Titelseite](/de-de/cover)
+  - [Schnellstart](de-de/quickstart.md)
+  - [Schreiben weiterer Seiten](de-de/more-pages.md)
+  - [Navigationsleiste anpassen](de-de/custom-navbar.md)
+  - [Titelseite](de-de/cover.md)
 
 - Anpassen
-  - [Einstellungen](/de-de/configuration)
-  - [Themen](/de-de/themes)
-  - [Liste der Erweiterungen](/de-de/plugins)
-  - [Schreiben eigener Erweiterungen](/de-de/write-a-plugin)
-  - [Markdown-Einstellungen](/de-de/markdown)
-  - [Hervorheben von Sprachen](/de-de/language-highlight)
+  - [Einstellungen](de-de/configuration.md)
+  - [Themen](de-de/themes.md)
+  - [Liste der Erweiterungen](de-de/plugins.md)
+  - [Schreiben eigener Erweiterungen](de-de/write-a-plugin.md)
+  - [Markdown-Einstellungen](de-de/markdown.md)
+  - [Hervorheben von Sprachen](de-de/language-highlight.md)
 
 - Guide
-  - [Inbetriebnahme](/de-de/deploy)
-  - [Helfer](/de-de/helpers)
-  - [Vue Kompatibilität](/de-de/vue)
-  - [CDN](/de-de/cdn)
-  - [Offline Modus (PWA)](/de-de/pwa)
+  - [Inbetriebnahme](de-de/deploy.md)
+  - [Helfer](de-de/helpers.md)
+  - [Vue Kompatibilität](de-de/vue.md)
+  - [CDN](de-de/cdn.md)
+  - [Offline Modus (PWA)](de-de/pwa.md)
 
-- [Changelog](/de-de/changelog)
+- [Changelog](de-de/changelog.md)

docs/de-de/cdn.md

@@ -44,4 +44,6 @@ Alternativ kannst du auch die [komprimierten Dateien](#komprimierte-dateien) ver
 
 ## Andere CDN
 
-[jsDelivr](http://www.jsdelivr.com/projects/docsify) ist auch verfügbar.
+- http://www.bootcdn.cn/docsify
+- http://www.jsdelivr.com/projects/docsify
+- https://cdnjs.com/libraries/docsify

docs/de-de/configuration.md

@@ -166,7 +166,7 @@ window.$docsify = {
 - Typ: `Boolean|String`
 - Standard: `false`
 
-Aktiviere das [Titelseitenfeature](/de-de/cover). Falls `true`, wird sie von `_coverpage.md` geladen.
+Aktiviere das [Titelseitenfeature](de-de/cover.md). Falls `true`, wird sie von `_coverpage.md` geladen.
 
 ```js
 window.$docsify = {
@@ -212,7 +212,7 @@ window.$docsify = {
 
 - Typ: `Function`
 
-Siehe [Markdown Konfiguration](/de-de/markdown).
+Siehe [Markdown Konfiguration](de-de/markdown.md).
 
 ```js
 window.$docsify = {
@@ -278,7 +278,7 @@ window.$docsify = {
 
 - Typ: `Boolean`
 
-Führe das Skript auf der Seite aus. Analysiere nur das erste script tag ([demo](/de-de/themes)).  Sollte Vue verwendet sein, wird es in der Standardeinstellung ausgeführt.
+Führe das Skript auf der Seite aus. Analysiere nur das erste script tag ([demo](de-de/themes.md)).  Sollte Vue verwendet sein, wird es in der Standardeinstellung ausgeführt.
 
 ```js
 window.$docsify = {
@@ -294,7 +294,7 @@ window.$docsify = {
 </script>
 ```
 
-?> Nehme zur Kenntnis, dass, solltest du ein externes Skript ausführen, z.B. ein eingebettete jsfiddle demo, du sicher gehen solltest, das [external-script](plugins?id=external-script) plugin zu verwenden.
+?> Nehme zur Kenntnis, dass, solltest du ein externes Skript ausführen, z.B. ein eingebettete jsfiddle demo, du sicher gehen solltest, das [external-script](de-de/plugins.md?id=external-script) plugin zu verwenden.
 
 ## no-emoji
 
@@ -305,3 +305,38 @@ window.$docsify = {
   noEmoji: true
 }
 ```
+
+## merge-navbar
+
+Navbar will be merged with the sidebar on smaller screens.
+
+```js
+window.$docsify = {
+  mergeNavbar: true
+}
+```
+
+## format-updated
+We can display the file update date through **{docsify-updated<span>}</span>** variable. And format it by `formatUpdated`. 
+See https://github.com/lukeed/tinydate#patterns
+```js
+window.$docsify = {
+  formatUpdated: '{MM}/{DD} {HH}:{mm}',
+
+  formatUpdated: function (time) {
+    // ...
+
+    return time
+  }
+}
+```
+
+## external-link-target
+
+Currently it defaults to _blank, would be nice if configurable:
+
+```js
+window.$docsify = {
+  externalLinkTarget: '_self' // default: '_blank'
+}
+```

docs/de-de/cover.md

@@ -1,6 +1,6 @@
 # Titelseite
 
-Aktiviere die Unterstützung für Titelseiten, indem du `coverpage` auf **true** einstellst, vergleiche [coverpage Einstellungen](/de-de/configuration#coverpage).
+Aktiviere die Unterstützung für Titelseiten, indem du `coverpage` auf **true** einstellst, vergleiche [coverpage Einstellungen](configuration.md#coverpage).
 
 ## Einfache Verwendung
 

docs/de-de/custom-navbar.md

@@ -20,7 +20,7 @@ Solltest du eine Navigationsleiste benötigen, so kannst du eine HTML-basierte e
 
 ## Markdown
 
-Oder du kannst deine Navigationsleiste mit einer Datei basierend auf Markdown erstellen, indem du `loadNavbar` auf **true** setzt und eine Datei namens `_navbar.md` erstellst, vergleiche [load-navbar Einstellungen](/de-de/configuration#load-navbar).
+Oder du kannst deine Navigationsleiste mit einer Datei basierend auf Markdown erstellen, indem du `loadNavbar` auf **true** setzt und eine Datei namens `_navbar.md` erstellst, vergleiche [load-navbar Einstellungen](configuration.md#load-navbar).
 
 ```html
 <!-- index.html -->
@@ -52,17 +52,17 @@ Du kannst untergeordnete Listen erstellen, indem du untergeordnete Punkte einem
 <!-- _navbar.md -->
 
 - Getting started
-  - [Quick start](/quickstart)
-  - [Writing more pages](/more-pages)
-  - [Custom navbar](/custom-navbar)
-  - [Cover page](/cover)
+  - [Quick start](de-de/quickstart.md)
+  - [Writing more pages](de-de/more-pages.md)
+  - [Custom navbar](de-de/custom-navbar.md)
+  - [Cover page](de-de/cover.md)
 
 - Configuration
-  - [Configuration](/configuration)
-  - [Themes](/themes)
-  - [Using plugins](/plugins)
-  - [Markdown configuration](/markdown)
-  - [Language highlight](/language-highlight)
+  - [Configuration](de-de/configuration.md)
+  - [Themes](de-de/themes.md)
+  - [Using plugins](de-de/plugins.md)
+  - [Markdown configuration](de-de/markdown.md)
+  - [Language highlight](de-de/language-highlight.md)
 ```
 
 wird also wie folgt aussehen
@@ -71,7 +71,7 @@ wird also wie folgt aussehen
 
 ## Angepasste Navigationsleisten in Verbindung mit dem emoji Erweiterung
 
-Solltest du die [emoji Erweiterung](/de-de/plugins#emoji) verwenden:
+Solltest du die [emoji Erweiterung](plugins.md#emoji) verwenden:
 
 ```html
 <!-- index.html -->

docs/de-de/more-pages.md

@@ -27,7 +27,7 @@ docs/de-de/guide.md   => http://domain.com/de-de/guide
 
 Als Standardeinstellung wird das Inhaltsverzeichnis in der Seitenleiste automatisch basierend auf vorhandenen Markdown Dateien generiert. Wenn du das seitliche Inhaltsverzeichnis anpassen willst, kannst du eine Datei namens `_sidebar.md` erstellen (vergleiche [das seitliche Inhaltsverzeichnis für diese Dokumentation](https://github.com/QingWei-Li/docsify/blob/master/docs/de-de/_sidebar.md) als Beispiel):
 
-Als Erstes musst du `loadSidebar` auf **true** setzen, vergleiche [Einstellungen für das seitliche Inhaltsverzeichnis](/de-de/configuration#load-sidebar).
+Als Erstes musst du `loadSidebar` auf **true** setzen, vergleiche [Einstellungen für das seitliche Inhaltsverzeichnis](configuration.md#load-sidebar).
 
 ```html
 <!-- index.html -->
@@ -46,7 +46,7 @@ Als Zweites erstellst du eine Datei namens `_sidebar.md`:
 <!-- docs/_sidebar.md -->
 
 - [Home](/)
-- [Guide](/guide)
+- [Guide](de-de/guide.md)
 ```
 
 !> Solltest du Github Pages verwenden, musst du zusätzlich eine Datei namens `.nojekyll` in `./docs` erstellen, um zu verhindern, dass Github Dateien ignoriert, die mit einem Unterstrich anfangen.
@@ -55,7 +55,7 @@ Als Zweites erstellst du eine Datei namens `_sidebar.md`:
 
 ## Inhaltsverzeichnis
 
-Eine angepasste Seitenleist kann auch automatisch ein Inhaltsverzeichnis generieren, indem ein `subMaxLevel` gesetzt wird, vergleiche [sub-max-level Einstellungen](/de-de/configuration#sub-max-level).
+Eine angepasste Seitenleist kann auch automatisch ein Inhaltsverzeichnis generieren, indem ein `subMaxLevel` gesetzt wird, vergleiche [sub-max-level Einstellungen](configuration.md#sub-max-level).
 
 ```html
 <!-- index.html -->

docs/de-de/quickstart.md

@@ -22,7 +22,7 @@ Nachdem der Befehl `init` vollständig ausgeführt wurde, kannst du folgende Dat
 * `README.md` als die Startseite für die Dokumentation
 * `.nojekyll` verhindert, dass Github Pages Dateien ignoriert, die mit einem Unterstrich beginnen.
 
-Du kannst die Dokumentation über die Datei `./docs/README.md` nach Belieben ändern, und natürlich [weitere Seiten](/de-de/more-pages) hinzufügen.
+Du kannst die Dokumentation über die Datei `./docs/README.md` nach Belieben ändern, und natürlich [weitere Seiten](de-de/more-pages.md) hinzufügen.
 
 ## Vorschau der eigenen Seiten
 
@@ -84,4 +84,4 @@ Du solltest das `data-app` Attribut anpassen, wenn du `el` geändert hast:
   </script>
 ```
 
-Vergleiche [el Einstellungen](/de-de/configuration#el).
+Vergleiche [el Einstellungen](configuration.md#el).

docs/index.html

@@ -32,7 +32,9 @@
     executeScript: true,
     loadSidebar: true,
     loadNavbar: true,
+    mergeNavbar: true,
     maxLevel: 4,
+    subMaxLevel: 2,
     name: 'docsify',
     search: {
       noData: {
@@ -47,7 +49,14 @@
         '/': 'Search'
       }
     },
-    subMaxLevel: 2
+    formatUpdated: '{MM}/{DD} {HH}:{mm}',
+    plugins: [
+      function(hook) {
+        hook.beforeEach(function (html) {
+          return html += '\n> Last modified {docsify-updated}'
+        })
+      }
+    ]
   }
 </script>
 <script src="//unpkg.com/docsify/lib/docsify.min.js"></script>

docs/more-pages.md

@@ -6,12 +6,12 @@ For example, the directory structure is as follows:
 
 ```text
 .
-├── docs
-|   └── README.md
-|   └── guide.md
-|   └── zh-cn
-|       └──README.md
-|       └──guide.md
+└── docs
+    ├── README.md
+    ├── guide.md
+    └── zh-cn
+        ├── README.md
+        └── guide.md
 ```
 
 Matching routes
@@ -27,7 +27,7 @@ docs/zh-cn/guide.md   => http://domain.com/zh-cn/guide
 
 By default, the table of contents in the sidebar is automatically generated based on your markdown files. If you need a custom sidebar, then you can create your own `_sidebar.md` (see [this documentation's sidebar](https://github.com/QingWei-Li/docsify/blob/master/docs/_sidebar.md) for an example):
 
-First, you need to set `loadSidebar` to **true**. Details are available in the [configuration paragraph](configuration#load-sidebar).
+First, you need to set `loadSidebar` to **true**. Details are available in the [configuration paragraph](configuration.md#load-sidebar).
 
 ```html
 <!-- index.html -->
@@ -46,7 +46,7 @@ Create the `_sidebar.md`:
 <!-- docs/_sidebar.md -->
 
 - [Home](/)
-- [Guide](/guide)
+- [Guide](guide.md)
 ```
 
 !> You need to create a `.nojekyll` in `./docs` to prevent GitHub Pages from ignoring files that begin with an underscore.
@@ -55,7 +55,7 @@ Create the `_sidebar.md`:
 
 ## Table of Contents
 
-A custom sidebar can also automatically generate a table of contents by setting a `subMaxLevel`, compare [sub-max-level configuration](configuration#sub-max-level).
+A custom sidebar can also automatically generate a table of contents by setting a `subMaxLevel`, compare [sub-max-level configuration](configuration.md#sub-max-level).
 
 ```html
 <!-- index.html -->

docs/quickstart.md

@@ -22,7 +22,7 @@ After the `init` is complete, you can see the file list in the `./docs` subdirec
 * `README.md` as the home page
 * `.nojekyll` prevents GitHub Pages from ignoring files that begin with an underscore
 
-You can easily update the documentation in `./docs/README.md`, of course you can add [more pages](more-pages).
+You can easily update the documentation in `./docs/README.md`, of course you can add [more pages](more-pages.md).
 
 ## Preview your site
 
@@ -84,4 +84,4 @@ You should set the `data-app` attribute if you changed `el`:
   </script>
 ```
 
-Compare [el configuration](/configuration#el).
+Compare [el configuration](configuration.md#el).

docs/ssr.config.js

@@ -0,0 +1,33 @@
+module.exports = {
+  config: {
+    alias: {
+      '/de-de/changelog': '/changelog',
+      '/zh-cn/changelog': '/changelog',
+      '/changelog': 'https://raw.githubusercontent.com/QingWei-Li/docsify/master/CHANGELOG'
+    },
+    auto2top: true,
+    coverpage: true,
+    executeScript: true,
+    loadSidebar: true,
+    loadNavbar: true,
+    mergeNavbar: true,
+    maxLevel: 4,
+    subMaxLevel: 2,
+    basePath: '/docs/',
+    name: 'docsify',
+    search: {
+      noData: {
+        '/de-de/': 'Keine Ergebnisse!',
+        '/zh-cn/': '没有结果!',
+        '/': 'No results!'
+      },
+      paths: 'auto',
+      placeholder: {
+        '/de-de/': 'Suche',
+        '/zh-cn/': '搜索',
+        '/': 'Search'
+      }
+    }
+  },
+  template: './docs/ssr.html'
+}

docs/ssr.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>docsify</title>
+  <link rel="icon" href="_media/favicon.ico">
+  <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="//unpkg.com/docsify@next/lib/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> -->
+  <style>
+    nav.app-nav li ul {
+      min-width: 100px;
+    }
+  </style>
+</head>
+<body>
+  <!--inject-app-->
+  <!--inject-config-->
+</body>
+<script src="/lib/docsify.js"></script>
+<script src="/lib/plugins/search.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> -->
+</html>

docs/ssr.md

@@ -0,0 +1,3 @@
+# Server client renderer
+
+See https://docsify.now.sh

docs/zh-cn/README.md

@@ -6,9 +6,9 @@
 
 docsify 是一个动态生成文档网站的工具。不同于 GitBook、Hexo 的地方是它不会生成将 `.md` 转成 `.html` 文件，所有转换工作都是在运行时进行。
 
-这将非常实用，如果只是需要快速的搭建一个小型的文档网站，或者不想因为生成的一堆 `.html` 文件“污染” commit 记录，只需要创建一个 `index.html` 就可以开始写文档而且直接[部署在 GitHub Pages](zh-cn/deploy)。
+这将非常实用，如果只是需要快速的搭建一个小型的文档网站，或者不想因为生成的一堆 `.html` 文件“污染” commit 记录，只需要创建一个 `index.html` 就可以开始写文档而且直接[部署在 GitHub Pages](zh-cn/deploy.md)。
 
-查看[快速开始](zh-cn/quickstart)了解详情。
+查看[快速开始](zh-cn/quickstart.md)了解详情。
 
 ## 特性
 - 无需构建，写完文档直接发布

docs/zh-cn/_navbar.md

@@ -1,4 +0,0 @@
-- :cn:
- - [:cn: 中文](/zh-cn/)
- - [:de: German](/de-de/)
- - [:uk: English](/)

docs/zh-cn/_sidebar.md

@@ -1,22 +1,22 @@
 - 入门
-  - [快速开始](zh-cn/quickstart)
-  - [多页文档](zh-cn/more-pages)
-  - [定制导航栏](zh-cn/custom-navbar)
-  - [封面](zh-cn/cover)
+  - [快速开始](zh-cn/quickstart.md)
+  - [多页文档](zh-cn/more-pages.md)
+  - [定制导航栏](zh-cn/custom-navbar.md)
+  - [封面](zh-cn/cover.md)
 
 - 定制化
-  - [配置项](zh-cn/configuration)
-  - [主题](zh-cn/themes)
-  - [插件列表](zh-cn/plugins)
-  - [开发插件](zh-cn/write-a-plugin)
-  - [Markdown 配置](zh-cn/markdown)
-  - [代码高亮](zh-cn/language-highlight)
+  - [配置项](zh-cn/configuration.md)
+  - [主题](zh-cn/themes.md)
+  - [插件列表](zh-cn/plugins.md)
+  - [开发插件](zh-cn/write-a-plugin.md)
+  - [Markdown 配置](zh-cn/markdown.md)
+  - [代码高亮](zh-cn/language-highlight.md)
 
 - 指南
- - [部署](zh-cn/deploy)
- - [文档助手](zh-cn/helpers)
- - [兼容 Vue](zh-cn/vue)
- - [CDN](zh-cn/cdn)
- - [离线模式(PWA)](zh-cn/pwa)
+ - [部署](zh-cn/deploy.md)
+ - [文档助手](zh-cn/helpers.md)
+ - [兼容 Vue](zh-cn/vue.md)
+ - [CDN](zh-cn/cdn.md)
+ - [离线模式(PWA)](zh-cn/pwa.md)
 
-- [Changelog](zh-cn/changelog)
+- [Changelog](zh-cn/changelog.md)

docs/zh-cn/cdn.md

@@ -44,5 +44,6 @@ JS 的压缩文件是原有文件路径的基础上加 `.min`后缀
 
 ## 其他 CDN
 
-[jsDelivr](http://www.jsdelivr.com/projects/docsify) 也是可用的，具体用法参考其文档。
-
+- http://www.bootcdn.cn/docsify
+- http://www.jsdelivr.com/projects/docsify
+- https://cdnjs.com/libraries/docsify

docs/zh-cn/configuration.md

@@ -74,7 +74,7 @@ window.$docsify = {
 - 类型：`Boolean|String`
 - 默认值: `false`
 
-加载自定义导航栏，参考[定制导航栏](zh-cn/custom-navbar) 了解用法。设置为 `true` 后会加载 `_navbar.md` 文件，也可以自定义加载的文件名。
+加载自定义导航栏，参考[定制导航栏](zh-cn/custom-navbar.md) 了解用法。设置为 `true` 后会加载 `_navbar.md` 文件，也可以自定义加载的文件名。
 
 ```js
 window.$docsify = {
@@ -91,7 +91,7 @@ window.$docsify = {
 - 类型：`Boolean|String`
 - 默认值: `false`
 
-加载自定义侧边栏，参考[多页文档](zh-cn/more-pages)。设置为 `true` 后会加载 `_sidebar.md` 文件，也可以自定义加载的文件名。
+加载自定义侧边栏，参考[多页文档](zh-cn/more-pages.md)。设置为 `true` 后会加载 `_sidebar.md` 文件，也可以自定义加载的文件名。
 
 ```js
 window.$docsify = {
@@ -173,7 +173,7 @@ window.$docsify = {
 - 类型：`Boolean|String`
 - 默认值: `false`
 
-启用[封面页](/zh-cn/cover)。开启后是加载 `_coverpage.md` 文件，也可以自定义文件名。
+启用[封面页](zh-cn/cover.md)。开启后是加载 `_coverpage.md` 文件，也可以自定义文件名。
 
 ```js
 window.$docsify = {
@@ -220,7 +220,7 @@ window.$docsify = {
 
 - 类型: `Object|Function`
 
-参考 [Markdown 配置](/zh-cn/markdown)。
+参考 [Markdown 配置](zh-cn/markdown.md)。
 
 ```js
 window.$docsify = {
@@ -287,7 +287,7 @@ window.$docsify = {
 
 - 类型：`Boolean`
 
-执行文档里的 script 标签里的脚本，只执行第一个 script ([demo](zh-cn/themes))。 如果 Vue 存在，则自动开启。
+执行文档里的 script 标签里的脚本，只执行第一个 script ([demo](zh-cn/themes.md))。 如果 Vue 存在，则自动开启。
 
 ```js
 window.$docsify = {
@@ -304,7 +304,7 @@ window.$docsify = {
 
 ```
 
-注意如果执行的是一个外链脚本，比如 jsfiddle 的内嵌 demo，请确保引入 [external-script](zh-cn/plugins?id=外链脚本-external-script) 插件。
+注意如果执行的是一个外链脚本，比如 jsfiddle 的内嵌 demo，请确保引入 [external-script](plugins.md?id=外链脚本-external-script) 插件。
 
 ## no-emoji
 
@@ -315,3 +315,38 @@ window.$docsify = {
   noEmoji: true
 }
 ```
+
+## merge-navbar
+
+小屏设备下合并导航栏到侧边栏。
+
+```js
+window.$docsify = {
+  mergeNavbar: true
+}
+```
+
+## format-updated
+我们可以显示文档更新日期通过 **{docsify-updated<span>}</span>** 变量. 并且格式化日期通过 `formatUpdated`. 
+参考 https://github.com/lukeed/tinydate#patterns
+```js
+window.$docsify = {
+  formatUpdated: '{MM}/{DD} {HH}:{mm}',
+
+  formatUpdated: function (time) {
+    // ...
+
+    return time
+  }
+}
+```
+
+## external-link-target
+
+Currently it defaults to _blank, would be nice if configurable:
+
+```js
+window.$docsify = {
+  externalLinkTarget: '_self' // default: '_blank'
+}
+```

docs/zh-cn/cover.md

@@ -1,6 +1,6 @@
 # 封面
 
-通过设置 `coverpage` 参数，可以开启渲染封面的功能。具体用法见[配置项#coverpage](zh-cn/configuration#coverpage)。
+通过设置 `coverpage` 参数，可以开启渲染封面的功能。具体用法见[配置项#coverpage](configuration.md#coverpage)。
 
 ## 基本用法
 

docs/zh-cn/custom-navbar.md

@@ -17,7 +17,7 @@
 
 ## 配置文件
 
-那我们可以通过 Markdown 文件来配置导航。首先配置 `loadNavbar`，默认加载的文件为 `_navbar.md`。具体配置规则见[配置项#load-navbar](zh-cn/configuration#load-navbar)。
+那我们可以通过 Markdown 文件来配置导航。首先配置 `loadNavbar`，默认加载的文件为 `_navbar.md`。具体配置规则见[配置项#load-navbar](configuration.md#load-navbar)。
 
 *index.html*
 
@@ -49,17 +49,17 @@
 
 ```markdown
 - 基础
- - [快速开始](zh-cn/quickstart)
- - [多页文档](zh-cn/more-pages)
- - [定制导航栏](zh-cn/custom-navbar)
- - [封面](zh-cn/cover)
+ - [快速开始](zh-cn/quickstart.md)
+ - [多页文档](zh-cn/more-pages.md)
+ - [定制导航栏](zh-cn/custom-navbar.md)
+ - [封面](zh-cn/cover.md)
 
 - 配置
-  - [配置项](zh-cn/configuration)
-  - [主题](zh-cn/themes)
-  - [使用插件](zh-cn/plugins)
-  - [Markdown 配置](zh-cn/markdown)
-  - [代码高亮](zh-cn/language-highlight)
+  - [配置项](zh-cn/configuration.md)
+  - [主题](zh-cn/themes.md)
+  - [使用插件](zh-cn/plugins.md)
+  - [Markdown 配置](zh-cn/markdown.md)
+  - [代码高亮](zh-cn/language-highlight.md)
 ```
 
 效果图

docs/zh-cn/more-pages.md

@@ -26,7 +26,7 @@ docs/zh-cn/guide.md   => http://domain.com/zh-cn/guide
 
 默认情况下，侧边栏会根据当前文档的标题生成目录。也可以设置文档链接，通过 Markdown 文件生成，效果如当前的文档的侧边栏。
 
-首先配置 `loadSidebar` 选项，具体配置规则见[配置项#load-sidebar](zh-cn/configuration#load-sidebar)。
+首先配置 `loadSidebar` 选项，具体配置规则见[配置项#load-sidebar](configuration.md#load-sidebar)。
 
 ```html
 <script>

docs/zh-cn/quickstart.md

@@ -22,7 +22,7 @@ docsify init ./docs
 - `README.md` 会做为主页内容渲染
 - `.nojekyll` 用于阻止 GitHub Pages 会忽略掉下划线开头的文件
 
-直接编辑 `docs/README.md` 就能更新网站内容，当然也可以[写多个页面](zh-cn/more-pages)。
+直接编辑 `docs/README.md` 就能更新网站内容，当然也可以[写多个页面](zh-cn/more-pages.md)。
 
 ## 本地预览网站
 

lib/plugins/external-script.js

@@ -4,15 +4,21 @@ this.D = this.D || {};
 
 function handleExternalScript () {
   var container = Docsify.dom.getNode('#main');
-  var script = Docsify.dom.find(container, 'script');
+  var scripts = Docsify.dom.findAll(container, 'script');
 
-  if (script && script.src) {
-    var newScript = document.createElement('script');['src', 'async', 'defer'].forEach(function (attribute) {
-      newScript[attribute] = script[attribute];
-    });
+  for (var i = scripts.length; i--;) {
+    var script = scripts[i];
 
-    script.parentNode.insertBefore(newScript, script);
-    script.parentNode.removeChild(script);
+    if (script && script.src) {
+      var newScript = document.createElement('script');
+
+      Array.prototype.slice.call(script.attributes).forEach(function (attribute) {
+        newScript[attribute.name] = attribute.value;
+      });
+
+      script.parentNode.insertBefore(newScript, script);
+      script.parentNode.removeChild(script);
+    }
   }
 }
 

lib/plugins/external-script.min.js

@@ -1 +1 @@
-this.D=this.D||{},function(){"use strict";function i(){var i=Docsify.dom.getNode("#main"),n=Docsify.dom.find(i,"script");if(n&&n.src){var o=document.createElement("script");["src","async","defer"].forEach(function(i){o[i]=n[i]}),n.parentNode.insertBefore(o,n),n.parentNode.removeChild(n)}}var n=function(n){n.doneEach(i)};window.$docsify.plugins=[].concat(n,window.$docsify.plugins)}();
+this.D=this.D||{},function(){"use strict";function e(){for(var e=Docsify.dom.getNode("#main"),i=Docsify.dom.findAll(e,"script"),o=i.length;o--;){var t=i[o];if(t&&t.src){var n=document.createElement("script");Array.prototype.slice.call(t.attributes).forEach(function(e){n[e.name]=e.value}),t.parentNode.insertBefore(n,t),t.parentNode.removeChild(t)}}}var i=function(i){i.doneEach(e)};window.$docsify.plugins=[].concat(i,window.$docsify.plugins)}();

lib/plugins/ga.js

@@ -11,24 +11,28 @@ function appendScript () {
 }
 
 function init (id) {
-  if (!window.ga) {
+  var ga = window.ga;
+
+  if (!ga) {
     appendScript();
-    window.ga = window.ga || function () {
-      (window.ga.q = window.ga.q || []).push(arguments);
+    ga = ga || function () {
+      (ga.q = ga.q || []).push(arguments);
     };
-    window.ga.l = Number(new Date());
-    window.ga('create', id, 'auto');
+    ga.l = Number(new Date());
+    ga('create', id, 'auto');
   }
+  return ga
 }
 
 function collect () {
-  init(window.$docsify.ga);
-  window.ga('set', 'page', location.href);
-  window.ga('send', 'pageview');
+  var ga = init($docsify.ga);
+
+  ga('set', 'page', location.hash);
+  ga('send', 'pageview');
 }
 
 var install = function (hook) {
-  if (!window.$docsify.ga) {
+  if (!$docsify.ga) {
     console.error('[Docsify] ga is required.');
     return
   }
@@ -36,6 +40,6 @@ var install = function (hook) {
   hook.beforeEach(collect);
 };
 
-window.$docsify.plugins = [].concat(install, window.$docsify.plugins);
+$docsify.plugins = [].concat(install, $docsify.plugins);
 
 }());

lib/plugins/ga.min.js

@@ -1 +1 @@
-this.D=this.D||{},function(){"use strict";function n(){var n=document.createElement("script");n.async=!0,n.src="https://www.google-analytics.com/analytics.js",document.body.appendChild(n)}function o(o){window.ga||(n(),window.ga=window.ga||function(){(window.ga.q=window.ga.q||[]).push(arguments)},window.ga.l=Number(new Date),window.ga("create",o,"auto"))}function i(){o(window.$docsify.ga),window.ga("set","page",location.href),window.ga("send","pageview")}var w=function(n){return window.$docsify.ga?void n.beforeEach(i):void console.error("[Docsify] ga is required.")};window.$docsify.plugins=[].concat(w,window.$docsify.plugins)}();
+this.D=this.D||{},function(){"use strict";function n(){var n=document.createElement("script");n.async=!0,n.src="https://www.google-analytics.com/analytics.js",document.body.appendChild(n)}function c(c){var e=window.ga;return e||(n(),e=e||function(){(e.q=e.q||[]).push(arguments)},e.l=Number(new Date),e("create",c,"auto")),e}function e(){var n=c($docsify.ga);n("set","page",location.hash),n("send","pageview")}var i=function(n){if(!$docsify.ga)return void console.error("[Docsify] ga is required.");n.beforeEach(e)};$docsify.plugins=[].concat(i,$docsify.plugins)}();

lib/plugins/search.js

@@ -18,18 +18,18 @@ function escapeHtml (string) {
   return String(string).replace(/[&<>"'\/]/g, function (s) { return entityMap[s]; })
 }
 
-function getAllPaths () {
+function getAllPaths (router) {
   var paths = [];
 
   helper.dom.findAll('a:not([data-nosearch])')
     .map(function (node) {
       var href = node.href;
       var originHref = node.getAttribute('href');
-      var path = helper.route.parse(href).path;
+      var path = router.parse(href).path;
 
       if (path &&
         paths.indexOf(path) === -1 &&
-        !helper.route.isAbsolutePath(originHref)) {
+        !Docsify.util.isAbsolutePath(originHref)) {
         paths.push(path);
       }
     });
@@ -42,18 +42,17 @@ function saveData (maxAge) {
   localStorage.setItem('docsify.search.index', JSON.stringify(INDEXS));
 }
 
-function genIndex (path, content) {
+function genIndex (path, content, router) {
   if ( content === void 0 ) content = '';
 
   var tokens = window.marked.lexer(content);
   var slugify = window.Docsify.slugify;
-  var toURL = Docsify.route.toURL;
   var index = {};
   var slug;
 
   tokens.forEach(function (token) {
     if (token.type === 'heading' && token.depth <= 2) {
-      slug = toURL(path, { id: slugify(token.text) });
+      slug = router.toURL(path, { id: slugify(token.text) });
       index[slug] = { slug: slug, title: token.text, body: '' };
     } else {
       if (!slug) { return }
@@ -79,7 +78,7 @@ function search (keywords) {
     data = data.concat(Object.keys(INDEXS[key]).map(function (page) { return INDEXS[key][page]; }));
   });
 
-  keywords = keywords.trim().split(/[\s\-\，\\/]+/);
+  keywords = [].concat(keywords, keywords.trim().split(/[\s\-\，\\/]+/));
 
   var loop = function ( i ) {
     var post = data[i];
@@ -153,7 +152,7 @@ function init$1 (config, vm) {
     return
   }
 
-  var paths = isAuto ? getAllPaths() : config.paths;
+  var paths = isAuto ? getAllPaths(vm.router) : config.paths;
   var len = paths.length;
   var count = 0;
 
@@ -161,73 +160,78 @@ function init$1 (config, vm) {
     if (INDEXS[path]) { return count++ }
 
     helper
-      .get(vm.$getFile(path))
+      .get(vm.router.getFile(path))
       .then(function (result) {
-        INDEXS[path] = genIndex(path, result);
+        INDEXS[path] = genIndex(path, result, vm.router);
         len === ++count && saveData(config.maxAge);
       });
   });
 }
 
-var dom;
 var NO_DATA_TEXT = '';
 
 function style () {
-  var code = "\n.sidebar {\n  padding-top: 0;\n}\n\n.search {\n  margin-bottom: 20px;\n  padding: 6px;\n  border-bottom: 1px solid #eee;\n}\n\n.search .results-panel {\n  display: none;\n}\n\n.search .results-panel.show {\n  display: block;\n}\n\n.search input {\n  outline: none;\n  border: none;\n  width: 100%;\n  padding: 7px;\n  line-height: 22px;\n  font-size: 14px;\n}\n\n.search h2 {\n  font-size: 17px;\n  margin: 10px 0;\n}\n\n.search a {\n  text-decoration: none;\n  color: inherit;\n}\n\n.search .matching-post {\n  border-bottom: 1px solid #eee;\n}\n\n.search .matching-post:last-child {\n  border-bottom: 0;\n}\n\n.search p {\n  font-size: 14px;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  display: -webkit-box;\n  -webkit-line-clamp: 2;\n  -webkit-box-orient: vertical;\n}\n\n.search p.empty {\n  text-align: center;\n}";
-  var style = dom.create('style', code);
-  dom.appendTo(dom.head, style);
+  var code = "\n.sidebar {\n  padding-top: 0;\n}\n\n.search {\n  margin-bottom: 20px;\n  padding: 6px;\n  border-bottom: 1px solid #eee;\n}\n\n.search .results-panel {\n  display: none;\n}\n\n.search .results-panel.show {\n  display: block;\n}\n\n.search input {\n  outline: none;\n  border: none;\n  width: 100%;\n  padding: 7px;\n  line-height: 22px;\n  font-size: 14px;\n  -webkit-appearance: none;\n  -moz-appearance: none;\n  appearance: none;\n}\n\n.search h2 {\n  font-size: 17px;\n  margin: 10px 0;\n}\n\n.search a {\n  text-decoration: none;\n  color: inherit;\n}\n\n.search .matching-post {\n  border-bottom: 1px solid #eee;\n}\n\n.search .matching-post:last-child {\n  border-bottom: 0;\n}\n\n.search p {\n  font-size: 14px;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  display: -webkit-box;\n  -webkit-line-clamp: 2;\n  -webkit-box-orient: vertical;\n}\n\n.search p.empty {\n  text-align: center;\n}";
+  var style = Docsify.dom.create('style', code);
+  Docsify.dom.appendTo(Docsify.dom.head, style);
 }
 
-function tpl (opts) {
+function tpl (opts, defaultValue) {
+  if ( defaultValue === void 0 ) defaultValue = '';
+
   var html =
-    "<input type=\"search\" />" +
+    "<input type=\"search\" value=\"" + defaultValue + "\" />" +
       '<div class="results-panel"></div>' +
     '</div>';
-  var el = dom.create('div', html);
-  var aside = dom.find('aside');
+  var el = Docsify.dom.create('div', html);
+  var aside = Docsify.dom.find('aside');
 
-  dom.toggleClass(el, 'search');
-  dom.before(aside, el);
+  Docsify.dom.toggleClass(el, 'search');
+  Docsify.dom.before(aside, el);
+}
+
+function doSearch (value) {
+  var $search = Docsify.dom.find('div.search');
+  var $panel = Docsify.dom.find($search, '.results-panel');
+
+  if (!value) {
+    $panel.classList.remove('show');
+    $panel.innerHTML = '';
+    return
+  }
+  var matchs = search(value);
+
+  var html = '';
+  matchs.forEach(function (post) {
+    html += "<div class=\"matching-post\">\n<h2><a href=\"" + (post.url) + "\">" + (post.title) + "</a></h2>\n<p>" + (post.content) + "</p>\n</div>";
+  });
+
+  $panel.classList.add('show');
+  $panel.innerHTML = html || ("<p class=\"empty\">" + NO_DATA_TEXT + "</p>");
 }
 
 function bindEvents () {
-  var $search = dom.find('div.search');
-  var $input = dom.find($search, 'input');
-  var $panel = dom.find($search, '.results-panel');
-  var doSearch = function (value) {
-    if (!value) {
-      $panel.classList.remove('show');
-      $panel.innerHTML = '';
-      return
-    }
-    var matchs = search(value);
-
-    var html = '';
-    matchs.forEach(function (post) {
-      html += "<div class=\"matching-post\">\n  <h2><a href=\"" + (post.url) + "\">" + (post.title) + "</a></h2>\n  <p>" + (post.content) + "</p>\n</div>";
-    });
-
-    $panel.classList.add('show');
-    $panel.innerHTML = html || ("<p class=\"empty\">" + NO_DATA_TEXT + "</p>");
-  };
+  var $search = Docsify.dom.find('div.search');
+  var $input = Docsify.dom.find($search, 'input');
 
   var timeId;
   // Prevent to Fold sidebar
-  dom.on($search, 'click',
+  Docsify.dom.on($search, 'click',
     function (e) { return e.target.tagName !== 'A' && e.stopPropagation(); });
-  dom.on($input, 'input', function (e) {
+  Docsify.dom.on($input, 'input', function (e) {
     clearTimeout(timeId);
     timeId = setTimeout(function (_) { return doSearch(e.target.value.trim()); }, 100);
   });
 }
 
 function updatePlaceholder (text, path) {
-  var $input = dom.getNode('.search input[type="search"]');
+  var $input = Docsify.dom.getNode('.search input[type="search"]');
 
+  if (!$input) { return }
   if (typeof text === 'string') {
     $input.placeholder = text;
   } else {
-    var match = Object.keys(text).find(function (key) { return path.indexOf(key) > -1; });
+    var match = Object.keys(text).filter(function (key) { return path.indexOf(key) > -1; })[0];
     $input.placeholder = text[match];
   }
 }
@@ -236,16 +240,18 @@ function updateNoData (text, path) {
   if (typeof text === 'string') {
     NO_DATA_TEXT = text;
   } else {
-    var match = Object.keys(text).find(function (key) { return path.indexOf(key) > -1; });
+    var match = Object.keys(text).filter(function (key) { return path.indexOf(key) > -1; })[0];
     NO_DATA_TEXT = text[match];
   }
 }
 
-function init$$1 (opts) {
-  dom = Docsify.dom;
+function init$$1 (opts, vm) {
+  var keywords = vm.router.parse().query.s;
+
   style();
-  tpl(opts);
+  tpl(opts, keywords);
   bindEvents();
+  keywords && setTimeout(function (_) { return doSearch(keywords); }, 500);
 }
 
 function update (opts, vm) {
@@ -276,7 +282,7 @@ var install = function (hook, vm) {
   var isAuto = CONFIG.paths === 'auto';
 
   hook.mounted(function (_) {
-    init$$1(CONFIG);
+    init$$1(CONFIG, vm);
     !isAuto && init$1(CONFIG, vm);
   });
   hook.doneEach(function (_) {
@@ -285,6 +291,6 @@ var install = function (hook, vm) {
   });
 };
 
-window.$docsify.plugins = [].concat(install, window.$docsify.plugins);
+$docsify.plugins = [].concat(install, $docsify.plugins);
 
 }());

lib/plugins/search.min.js

@@ -1 +1 @@
-this.D=this.D||{},function(){"use strict";function e(e){var n={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#x2F;"};return String(e).replace(/[&<>"'\/]/g,function(e){return n[e]})}function n(){var e=[];return d.dom.findAll("a:not([data-nosearch])").map(function(n){var t=n.href,o=n.getAttribute("href"),a=d.route.parse(t).path;a&&e.indexOf(a)===-1&&!d.route.isAbsolutePath(o)&&e.push(a)}),e}function t(e){localStorage.setItem("docsify.search.expires",Date.now()+e),localStorage.setItem("docsify.search.index",JSON.stringify(g))}function o(e,n){void 0===n&&(n="");var t,o=window.marked.lexer(n),a=window.Docsify.slugify,i=Docsify.route.toURL,r={};return o.forEach(function(n){if("heading"===n.type&&n.depth<=2)t=i(e,{id:a(n.text)}),r[t]={slug:t,title:n.text,body:""};else{if(!t)return;r[t]?r[t].body?r[t].body+="\n"+(n.text||""):r[t].body=n.text:r[t]={slug:t,title:"",body:""}}}),a.clear(),r}function a(n){var t=[],o=[];Object.keys(g).forEach(function(e){o=o.concat(Object.keys(g[e]).map(function(n){return g[e][n]}))}),n=n.trim().split(/[\s\-\，\\\/]+/);for(var a=function(a){var i=o[a],r=!1,s="",c=i.title&&i.title.trim(),l=i.body&&i.body.trim(),u=i.slug||"";if(c&&l&&(n.forEach(function(n,t){var o=new RegExp(n,"gi"),a=-1,i=-1;if(a=c&&c.search(o),i=l&&l.search(o),a<0&&i<0)r=!1;else{r=!0,i<0&&(i=0);var u=0,f=0;u=i<11?0:i-10,f=0===u?70:i+n.length+60,f>l.length&&(f=l.length);var p="..."+e(l).substring(u,f).replace(o,'<em class="search-keyword">'+n+"</em>")+"...";s+=p}}),r)){var f={title:e(c),content:s,url:u};t.push(f)}},i=0;i<o.length;i++)a(i);return t}function i(e,a){d=Docsify;var i="auto"===e.paths,r=localStorage.getItem("docsify.search.expires")<Date.now();if(g=JSON.parse(localStorage.getItem("docsify.search.index")),r)g={};else if(!i)return;var s=i?n():e.paths,c=s.length,l=0;s.forEach(function(n){return g[n]?l++:void d.get(a.$getFile(n)).then(function(a){g[n]=o(n,a),c===++l&&t(e.maxAge)})})}function r(){var e="\n.sidebar {\n  padding-top: 0;\n}\n\n.search {\n  margin-bottom: 20px;\n  padding: 6px;\n  border-bottom: 1px solid #eee;\n}\n\n.search .results-panel {\n  display: none;\n}\n\n.search .results-panel.show {\n  display: block;\n}\n\n.search input {\n  outline: none;\n  border: none;\n  width: 100%;\n  padding: 7px;\n  line-height: 22px;\n  font-size: 14px;\n}\n\n.search h2 {\n  font-size: 17px;\n  margin: 10px 0;\n}\n\n.search a {\n  text-decoration: none;\n  color: inherit;\n}\n\n.search .matching-post {\n  border-bottom: 1px solid #eee;\n}\n\n.search .matching-post:last-child {\n  border-bottom: 0;\n}\n\n.search p {\n  font-size: 14px;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  display: -webkit-box;\n  -webkit-line-clamp: 2;\n  -webkit-box-orient: vertical;\n}\n\n.search p.empty {\n  text-align: center;\n}",n=h.create("style",e);h.appendTo(h.head,n)}function s(e){var n='<input type="search" /><div class="results-panel"></div></div>',t=h.create("div",n),o=h.find("aside");h.toggleClass(t,"search"),h.before(o,t)}function c(){var e,n=h.find("div.search"),t=h.find(n,"input"),o=h.find(n,".results-panel"),i=function(e){if(!e)return o.classList.remove("show"),void(o.innerHTML="");var n=a(e),t="";n.forEach(function(e){t+='<div class="matching-post">\n  <h2><a href="'+e.url+'">'+e.title+"</a></h2>\n  <p>"+e.content+"</p>\n</div>"}),o.classList.add("show"),o.innerHTML=t||'<p class="empty">'+y+"</p>"};h.on(n,"click",function(e){return"A"!==e.target.tagName&&e.stopPropagation()}),h.on(t,"input",function(n){clearTimeout(e),e=setTimeout(function(e){return i(n.target.value.trim())},100)})}function l(e,n){var t=h.getNode('.search input[type="search"]');if("string"==typeof e)t.placeholder=e;else{var o=Object.keys(e).find(function(e){return n.indexOf(e)>-1});t.placeholder=e[o]}}function u(e,n){if("string"==typeof e)y=e;else{var t=Object.keys(e).find(function(e){return n.indexOf(e)>-1});y=e[t]}}function f(e){h=Docsify.dom,r(),s(e),c()}function p(e,n){l(e.placeholder,n.route.path),u(e.noData,n.route.path)}var d,h,g={},y="",m={placeholder:"Type to search",noData:"No Results!",paths:"auto",maxAge:864e5},v=function(e,n){var t=Docsify.util,o=n.config.search||m;Array.isArray(o)?m.paths=o:"object"==typeof o&&(m.paths=Array.isArray(o.paths)?o.paths:"auto",m.maxAge=t.isPrimitive(o.maxAge)?o.maxAge:m.maxAge,m.placeholder=o.placeholder||m.placeholder,m.noData=o.noData||m.noData);var a="auto"===m.paths;e.mounted(function(e){f(m),!a&&i(m,n)}),e.doneEach(function(e){p(m,n),a&&i(m,n)})};window.$docsify.plugins=[].concat(v,window.$docsify.plugins)}();
+this.D=this.D||{},function(){"use strict";function e(e){var n={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#x2F;"};return String(e).replace(/[&<>"'\/]/g,function(e){return n[e]})}function n(e){var n=[];return h.dom.findAll("a:not([data-nosearch])").map(function(t){var o=t.href,i=t.getAttribute("href"),r=e.parse(o).path;r&&-1===n.indexOf(r)&&!Docsify.util.isAbsolutePath(i)&&n.push(r)}),n}function t(e){localStorage.setItem("docsify.search.expires",Date.now()+e),localStorage.setItem("docsify.search.index",JSON.stringify(y))}function o(e,n,t){void 0===n&&(n="");var o,i=window.marked.lexer(n),r=window.Docsify.slugify,a={};return i.forEach(function(n){if("heading"===n.type&&n.depth<=2)o=t.toURL(e,{id:r(n.text)}),a[o]={slug:o,title:n.text,body:""};else{if(!o)return;a[o]?a[o].body?a[o].body+="\n"+(n.text||""):a[o].body=n.text:a[o]={slug:o,title:"",body:""}}}),r.clear(),a}function i(n){var t=[],o=[];Object.keys(y).forEach(function(e){o=o.concat(Object.keys(y[e]).map(function(n){return y[e][n]}))}),n=[].concat(n,n.trim().split(/[\s\-\，\\\/]+/));for(var i=0;i<o.length;i++)!function(i){var r=o[i],a=!1,s="",c=r.title&&r.title.trim(),f=r.body&&r.body.trim(),l=r.slug||"";if(c&&f&&(n.forEach(function(n,t){var o=new RegExp(n,"gi"),i=-1,r=-1;if(i=c&&c.search(o),r=f&&f.search(o),i<0&&r<0)a=!1;else{a=!0,r<0&&(r=0);var l=0,d=0;l=r<11?0:r-10,d=0===l?70:r+n.length+60,d>f.length&&(d=f.length);var u="..."+e(f).substring(l,d).replace(o,'<em class="search-keyword">'+n+"</em>")+"...";s+=u}}),a)){var d={title:e(c),content:s,url:l};t.push(d)}}(i);return t}function r(e,i){h=Docsify;var r="auto"===e.paths,a=localStorage.getItem("docsify.search.expires")<Date.now();if(y=JSON.parse(localStorage.getItem("docsify.search.index")),a)y={};else if(!r)return;var s=r?n(i.router):e.paths,c=s.length,f=0;s.forEach(function(n){if(y[n])return f++;h.get(i.router.getFile(n)).then(function(r){y[n]=o(n,r,i.router),c===++f&&t(e.maxAge)})})}function a(){var e=Docsify.dom.create("style","\n.sidebar {\n  padding-top: 0;\n}\n\n.search {\n  margin-bottom: 20px;\n  padding: 6px;\n  border-bottom: 1px solid #eee;\n}\n\n.search .results-panel {\n  display: none;\n}\n\n.search .results-panel.show {\n  display: block;\n}\n\n.search input {\n  outline: none;\n  border: none;\n  width: 100%;\n  padding: 7px;\n  line-height: 22px;\n  font-size: 14px;\n  -webkit-appearance: none;\n  -moz-appearance: none;\n  appearance: none;\n}\n\n.search h2 {\n  font-size: 17px;\n  margin: 10px 0;\n}\n\n.search a {\n  text-decoration: none;\n  color: inherit;\n}\n\n.search .matching-post {\n  border-bottom: 1px solid #eee;\n}\n\n.search .matching-post:last-child {\n  border-bottom: 0;\n}\n\n.search p {\n  font-size: 14px;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  display: -webkit-box;\n  -webkit-line-clamp: 2;\n  -webkit-box-orient: vertical;\n}\n\n.search p.empty {\n  text-align: center;\n}");Docsify.dom.appendTo(Docsify.dom.head,e)}function s(e,n){void 0===n&&(n="");var t='<input type="search" value="'+n+'" /><div class="results-panel"></div></div>',o=Docsify.dom.create("div",t),i=Docsify.dom.find("aside");Docsify.dom.toggleClass(o,"search"),Docsify.dom.before(i,o)}function c(e){var n=Docsify.dom.find("div.search"),t=Docsify.dom.find(n,".results-panel");if(!e)return t.classList.remove("show"),void(t.innerHTML="");var o=i(e),r="";o.forEach(function(e){r+='<div class="matching-post">\n<h2><a href="'+e.url+'">'+e.title+"</a></h2>\n<p>"+e.content+"</p>\n</div>"}),t.classList.add("show"),t.innerHTML=r||'<p class="empty">'+m+"</p>"}function f(){var e,n=Docsify.dom.find("div.search"),t=Docsify.dom.find(n,"input");Docsify.dom.on(n,"click",function(e){return"A"!==e.target.tagName&&e.stopPropagation()}),Docsify.dom.on(t,"input",function(n){clearTimeout(e),e=setTimeout(function(e){return c(n.target.value.trim())},100)})}function l(e,n){var t=Docsify.dom.getNode('.search input[type="search"]');if(t)if("string"==typeof e)t.placeholder=e;else{var o=Object.keys(e).filter(function(e){return n.indexOf(e)>-1})[0];t.placeholder=e[o]}}function d(e,n){if("string"==typeof e)m=e;else{var t=Object.keys(e).filter(function(e){return n.indexOf(e)>-1})[0];m=e[t]}}function u(e,n){var t=n.router.parse().query.s;a(),s(e,t),f(),t&&setTimeout(function(e){return c(t)},500)}function p(e,n){l(e.placeholder,n.route.path),d(e.noData,n.route.path)}var h,y={},m="",g={placeholder:"Type to search",noData:"No Results!",paths:"auto",maxAge:864e5},v=function(e,n){var t=Docsify.util,o=n.config.search||g;Array.isArray(o)?g.paths=o:"object"==typeof o&&(g.paths=Array.isArray(o.paths)?o.paths:"auto",g.maxAge=t.isPrimitive(o.maxAge)?o.maxAge:g.maxAge,g.placeholder=o.placeholder||g.placeholder,g.noData=o.noData||g.noData);var i="auto"===g.paths;e.mounted(function(e){u(g,n),!i&&r(g,n)}),e.doneEach(function(e){p(g,n),i&&r(g,n)})};$docsify.plugins=[].concat(v,$docsify.plugins)}();

lib/plugins/zoom-image.min.js

@@ -1 +1 @@
-this.D=this.D||{},function(){"use strict";function t(t,e){return e={exports:{}},t(e,e.exports),e.exports}function e(t){var e,n=Docsify.dom;n.appendTo(n.head,n.create("style",i)),t.doneEach(function(t){var i=n.findAll("img:not(.emoji)");Array.isArray(e)&&e.length&&(e.forEach(function(t){return t()}),e=[]),e=i.map(o)})}var n="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},o=t(function(t,e){!function(e,n){t.exports=n()}(n,function(){function t(){g===-1&&(g=window.pageYOffset);var t=Math.abs(g-window.pageYOffset);t>=40&&a()}function e(t){27===t.keyCode&&a()}function n(t){var e=t.touches[0];null!==e&&(y=e.pageY,t.target.addEventListener("touchmove",o))}function o(t){var e=t.touches[0];null!==e&&Math.abs(e.pageY-y)>10&&(a(),t.target.removeEventListener("touchmove",o))}function i(){a()}function r(){document.addEventListener("scroll",t),document.addEventListener("keyup",e),document.addEventListener("touchstart",n),document.addEventListener("click",i,!0)}function s(){document.removeEventListener("scroll",t),document.removeEventListener("keyup",e),document.removeEventListener("touchstart",n),document.removeEventListener("click",i,!0)}function a(t){null!==h&&(t?h.dispose():h.close(),s(),h=null)}function c(t){if(!document.body.classList.contains("zoom-overlay-open"))return t.metaKey||t.ctrlKey?void window.open(t.target.getAttribute("data-original")||t.target.src,"_blank"):void(t.target.width>=m()-v||(a(!0),h=new p(t.target,v),h.zoom(),r()))}var m=function(){return document.documentElement.clientWidth},u=function(){return document.documentElement.clientHeight},d=function(t){var e=t.getBoundingClientRect(),n=document.documentElement,o=window;return{top:e.top+o.pageYOffset-n.clientTop,left:e.left+o.pageXOffset-n.clientLeft}},l=function(t,e,n){var o=function(t){t.target.removeEventListener(e,o),n()};t.addEventListener(e,o)},f=function(t,e){this.w=t,this.h=e},p=function(t,e){this.img=t,this.preservedTransform=t.style.transform,this.wrap=null,this.overlay=null,this.offset=e};p.prototype.forceRepaint=function(){this.img.offsetWidth},p.prototype.zoom=function(){var t=new f(this.img.naturalWidth,this.img.naturalHeight);this.wrap=document.createElement("div"),this.wrap.classList.add("zoom-img-wrap"),this.img.parentNode.insertBefore(this.wrap,this.img),this.wrap.appendChild(this.img),this.img.classList.add("zoom-img"),this.img.setAttribute("data-action","zoom-out"),this.overlay=document.createElement("div"),this.overlay.classList.add("zoom-overlay"),document.body.appendChild(this.overlay),this.forceRepaint();var e=this.calculateScale(t);this.forceRepaint(),this.animate(e),document.body.classList.add("zoom-overlay-open")},p.prototype.calculateScale=function(t){var e=t.w/this.img.width,n=m()-this.offset,o=u()-this.offset,i=t.w/t.h,r=n/o;return t.w<n&&t.h<o?e:i<r?o/t.h*e:n/t.w*e},p.prototype.animate=function(t){var e=d(this.img),n=window.pageYOffset,o=m()/2,i=n+u()/2,r=e.left+this.img.width/2,s=e.top+this.img.height/2,a=o-r,c=i-s,l=0,f="scale("+t+")",p="translate3d("+a+"px, "+c+"px, "+l+"px)";this.img.style.transform=f,this.wrap.style.transform=p},p.prototype.dispose=function(){null!==this.wrap&&null!==this.wrap.parentNode&&(this.img.classList.remove("zoom-img"),this.img.setAttribute("data-action","zoom"),this.wrap.parentNode.insertBefore(this.img,this.wrap),this.wrap.parentNode.removeChild(this.wrap),document.body.removeChild(this.overlay),document.body.classList.remove("zoom-overlay-transitioning"))},p.prototype.close=function(){var t=this;document.body.classList.add("zoom-overlay-transitioning"),this.img.style.transform=this.preservedTransform,0===this.img.style.length&&this.img.removeAttribute("style"),this.wrap.style.transform="none",l(this.img,"transitionend",function(){t.dispose(),document.body.classList.remove("zoom-overlay-open")})};var h=null,v=80,g=-1,y=-1,w=function(t){return t.setAttribute("data-action","zoom"),t.addEventListener("click",c),function(){return t.removeEventListener("click",c)}};return w})}),i='img[data-action="zoom"] {\n  cursor: pointer;\n  cursor: -webkit-zoom-in;\n  cursor: zoom-in;\n}\n.zoom-img,\n.zoom-img-wrap {\n  position: relative;\n  z-index: 666;\n  transition: -webkit-transform 300ms cubic-bezier(.2,0,.2,1);\n  transition: transform 300ms cubic-bezier(.2,0,.2,1);\n  transition: transform 300ms cubic-bezier(.2,0,.2,1), -webkit-transform 300ms cubic-bezier(.2,0,.2,1);\n}\n.zoom-overlay {\n  z-index: 420;\n  background: #fff;\n  position: fixed;\n  top: 0;\n  left: 0;\n  right: 0;\n  bottom: 0;\n  pointer-events: none;\n  opacity: 0;\n  transition: opacity 300ms;\n}\n.zoom-overlay-open .zoom-overlay {\n  opacity: 1;\n}\n.zoom-overlay-open {\n  cursor: pointer;\n  cursor: -webkit-zoom-out;\n  cursor: zoom-out;\n}\n.zoom-overlay-transitioning {\n  cursor: default;\n}\n.zoom-overlay-open.zoom-overlay-transitioning .zoom-overlay{\n  opacity: 0;\n}\n';$docsify.plugins=[].concat(e,$docsify.plugins)}();
+this.D=this.D||{},function(){"use strict";function t(t){var o,i=Docsify.dom;i.appendTo(i.head,i.create("style",n)),t.doneEach(function(t){var n=i.findAll("img:not(.emoji)");Array.isArray(o)&&o.length&&(o.forEach(function(t){return t()}),o=[]),o=n.map(e)})}var e=("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self&&self,function(t,e){return e={exports:{}},t(e,e.exports),e.exports}(function(t,e){!function(e,n){t.exports=function(){function t(){-1===g&&(g=window.pageYOffset),Math.abs(g-window.pageYOffset)>=40&&a()}function e(t){27===t.keyCode&&a()}function n(t){var e=t.touches[0];null!==e&&(y=e.pageY,t.target.addEventListener("touchmove",o))}function o(t){var e=t.touches[0];null!==e&&Math.abs(e.pageY-y)>10&&(a(),t.target.removeEventListener("touchmove",o))}function i(){a()}function r(){document.addEventListener("scroll",t),document.addEventListener("keyup",e),document.addEventListener("touchstart",n),document.addEventListener("click",i,!0)}function s(){document.removeEventListener("scroll",t),document.removeEventListener("keyup",e),document.removeEventListener("touchstart",n),document.removeEventListener("click",i,!0)}function a(t){null!==h&&(t?h.dispose():h.close(),s(),h=null)}function c(t){if(!document.body.classList.contains("zoom-overlay-open"))return t.metaKey||t.ctrlKey?void window.open(t.target.getAttribute("data-original")||t.target.src,"_blank"):void(t.target.width>=m()-v||(a(!0),h=new p(t.target,v),h.zoom(),r()))}var m=function(){return document.documentElement.clientWidth},u=function(){return document.documentElement.clientHeight},d=function(t){var e=t.getBoundingClientRect(),n=document.documentElement,o=window;return{top:e.top+o.pageYOffset-n.clientTop,left:e.left+o.pageXOffset-n.clientLeft}},l=function(t,e,n){var o=function(t){t.target.removeEventListener(e,o),n()};t.addEventListener(e,o)},f=function(t,e){this.w=t,this.h=e},p=function(t,e){this.img=t,this.preservedTransform=t.style.transform,this.wrap=null,this.overlay=null,this.offset=e};p.prototype.forceRepaint=function(){this.img.offsetWidth},p.prototype.zoom=function(){var t=new f(this.img.naturalWidth,this.img.naturalHeight);this.wrap=document.createElement("div"),this.wrap.classList.add("zoom-img-wrap"),this.img.parentNode.insertBefore(this.wrap,this.img),this.wrap.appendChild(this.img),this.img.classList.add("zoom-img"),this.img.setAttribute("data-action","zoom-out"),this.overlay=document.createElement("div"),this.overlay.classList.add("zoom-overlay"),document.body.appendChild(this.overlay),this.forceRepaint();var e=this.calculateScale(t);this.forceRepaint(),this.animate(e),document.body.classList.add("zoom-overlay-open")},p.prototype.calculateScale=function(t){var e=t.w/this.img.width,n=m()-this.offset,o=u()-this.offset,i=t.w/t.h,r=n/o;return t.w<n&&t.h<o?e:i<r?o/t.h*e:n/t.w*e},p.prototype.animate=function(t){var e=d(this.img),n=window.pageYOffset,o=m()/2,i=n+u()/2,r=e.left+this.img.width/2,s=e.top+this.img.height/2,a=o-r,c=i-s,l="scale("+t+")",f="translate3d("+a+"px, "+c+"px, 0px)";this.img.style.transform=l,this.wrap.style.transform=f},p.prototype.dispose=function(){null!==this.wrap&&null!==this.wrap.parentNode&&(this.img.classList.remove("zoom-img"),this.img.setAttribute("data-action","zoom"),this.wrap.parentNode.insertBefore(this.img,this.wrap),this.wrap.parentNode.removeChild(this.wrap),document.body.removeChild(this.overlay),document.body.classList.remove("zoom-overlay-transitioning"))},p.prototype.close=function(){var t=this;document.body.classList.add("zoom-overlay-transitioning"),this.img.style.transform=this.preservedTransform,0===this.img.style.length&&this.img.removeAttribute("style"),this.wrap.style.transform="none",l(this.img,"transitionend",function(){t.dispose(),document.body.classList.remove("zoom-overlay-open")})};var h=null,v=80,g=-1,y=-1;return function(t){return t.setAttribute("data-action","zoom"),t.addEventListener("click",c),function(){return t.removeEventListener("click",c)}}}()}()})),n='img[data-action="zoom"] {\n  cursor: pointer;\n  cursor: -webkit-zoom-in;\n  cursor: zoom-in;\n}\n.zoom-img,\n.zoom-img-wrap {\n  position: relative;\n  z-index: 666;\n  transition: -webkit-transform 300ms cubic-bezier(.2,0,.2,1);\n  transition: transform 300ms cubic-bezier(.2,0,.2,1);\n  transition: transform 300ms cubic-bezier(.2,0,.2,1), -webkit-transform 300ms cubic-bezier(.2,0,.2,1);\n}\n.zoom-overlay {\n  z-index: 420;\n  background: #fff;\n  position: fixed;\n  top: 0;\n  left: 0;\n  right: 0;\n  bottom: 0;\n  pointer-events: none;\n  opacity: 0;\n  transition: opacity 300ms;\n}\n.zoom-overlay-open .zoom-overlay {\n  opacity: 1;\n}\n.zoom-overlay-open {\n  cursor: pointer;\n  cursor: -webkit-zoom-out;\n  cursor: zoom-out;\n}\n.zoom-overlay-transitioning {\n  cursor: default;\n}\n.zoom-overlay-open.zoom-overlay-transitioning .zoom-overlay{\n  opacity: 0;\n}\n';$docsify.plugins=[].concat(t,$docsify.plugins)}();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify",
-  "version": "3.4.3",
+  "version": "4.0.1",
   "description": "A magical documentation generator.",
   "author": {
     "name": "qingwei-li",
@@ -20,25 +20,30 @@
     "themes"
   ],
   "scripts": {
-    "build": "rm -rf lib themes && node build/build.js && mkdir lib/themes && mkdir themes && node build/build-css.js",
-    "dev:build": "rm -rf lib themes && mkdir themes && node build/build.js --dev && node build/build-css.js --dev",
-    "dev": "node app.js & nodemon -w src -e js,css --exec 'npm run dev:build'",
-    "test": "eslint src"
+    "build": "rm -rf lib themes && node build/build && mkdir lib/themes && mkdir themes && node build/build-css && npm run build:ssr",
+    "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'",
+    "build:ssr": "node build/build-ssr",
+    "test": "eslint {src,packages} --fix",
+    "pub:next": "RELEASE_TAG=next sh build/release.sh",
+    "pub": "sh build/release.sh"
   },
   "dependencies": {
     "marked": "^0.3.6",
     "prismjs": "^1.6.0",
+    "tinydate": "^1.0.0",
     "zoom-image": "^0.1.4"
   },
   "devDependencies": {
     "cssnano": "^3.10.0",
-    "eslint": "^3.17.1",
+    "eslint": "^3.18.0",
     "eslint-config-vue": "^2.0.2",
     "eslint-plugin-vue": "^2.0.1",
     "nodemon": "^1.11.0",
     "postcss": "^5.2.16",
     "postcss-salad": "^1.0.8",
-    "rollup": "^0.41.5",
+    "rollup": "^0.41.6",
+    "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/.gitignore

@@ -0,0 +1,4 @@
+build.js
+node_modules
+*.log
+.git

packages/docsify-server-renderer/README.md

@@ -0,0 +1,46 @@
+# docsify-server-renderer
+
+## Install
+
+```bash
+yarn add docsify-server-render
+```
+
+## Usage
+
+```js
+var Renderer = require('docsify-server-renderer')
+var readFileSync = require('fs').readFileSync
+
+// init
+var renderer = new Renderer({
+  template: readFileSync('./docs/index.template.html', 'utf-8').,
+  config: {
+    name: 'docsify',
+    repo: 'qingwei-li/docsify'
+  }
+})
+
+renderer.renderToString({ url })
+  .then(html => {})
+  .catch(err => {})
+```
+
+*index.template.html*
+
+```html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>docsify</title>
+  <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="//unpkg.com/docsify/themes/buble.css" title="buble" disabled>
+</head>
+<body>
+  <!--inject-app-->
+  <!--inject-config-->
+  <script src="//unpkg.com/docsify/lib/docsify.js"></script>
+</body>
+</html>
+```

packages/docsify-server-renderer/index.js

@@ -0,0 +1,137 @@
+import * as tpl from '../../src/core/render/tpl'
+import fetch from 'node-fetch'
+import { AbstractHistory } from '../../src/core/router/history/abstract'
+import { Compiler } from '../../src/core/render/compiler'
+import { isAbsolutePath } from '../../src/core/router/util'
+import { readFileSync } from 'fs'
+import { resolve, basename } from 'path'
+
+function cwd (...args) {
+  return resolve(process.cwd(), ...args)
+}
+
+function mainTpl (config) {
+  let html = `<nav class="app-nav${config.repo ? '' : ' no-badge'}"><!--navbar--></nav>`
+
+  if (config.repo) {
+    html += tpl.corner(config.repo)
+  }
+  if (config.coverpage) {
+    html += tpl.cover()
+  }
+
+  html += tpl.main(config)
+
+  return html
+}
+
+export default class Renderer {
+  constructor ({
+    template,
+    config,
+    cache
+  }) {
+    this.html = template
+    this.config = config = Object.assign({}, config, {
+      routerMode: 'history'
+    })
+    this.cache = cache
+
+    this.router = new AbstractHistory(config)
+    this.compiler = new Compiler(config, this.router)
+
+    this.router.getCurrentPath = () => this.url
+    this._renderHtml('inject-config', `<script>window.$docsify = ${JSON.stringify(config)}</script>`)
+    this._renderHtml('inject-app', mainTpl(config))
+
+    this.template = this.html
+  }
+
+  _getPath (url) {
+    const file = this.router.getFile(url)
+
+    return isAbsolutePath(file)
+      ? file
+      : cwd(`./${file}`)
+  }
+
+  async renderToString (url) {
+    this.url = url = this.router.parse(url).path
+    const { loadSidebar, loadNavbar } = this.config
+
+    const mainFile = this._getPath(url)
+    this._renderHtml('main', await this._render(mainFile))
+
+    if (loadSidebar) {
+      const name = loadSidebar === true ? '_sidebar.md' : loadSidebar
+      const sidebarFile = this._getPath(resolve(url, `../${name}`))
+      this._renderHtml('sidebar', await this._render(sidebarFile, 'sidebar'))
+    }
+
+    if (loadNavbar) {
+      const name = loadNavbar === true ? '_navbar.md' : loadNavbar
+      const navbarFile = this._getPath(resolve(url, `../${name}`))
+      this._renderHtml('navbar', await this._render(navbarFile, 'navbar'))
+    }
+
+    const html = this.html
+    this.html = this.template
+
+    return html
+  }
+
+  _renderHtml (match, content) {
+    this.html = this.html.replace(new RegExp(`<!--${match}-->`, 'g'), content)
+
+    return this.html
+  }
+
+  async _render (path, type) {
+    let html = await this._loadFile(path)
+    const { subMaxLevel, maxLevel } = this.config
+
+    switch (type) {
+      case 'sidebar':
+        html = this.compiler.sidebar(html, maxLevel) +
+          `<script>window.__SUB_SIDEBAR__ = ${JSON.stringify(
+            this.compiler.subSidebar(html, subMaxLevel)
+          )}</script>`
+        break
+      case 'cover':
+        html = this.compiler.cover(html)
+        break
+      case 'navbar':
+      case 'article':
+      default:
+        html = this.compiler.compile(html)
+        break
+    }
+
+    return html
+  }
+
+  async _loadFile (filePath) {
+    let content
+    try {
+      if (isAbsolutePath(filePath)) {
+        const res = await fetch(filePath)
+        content = await res.text()
+        this.lock = 0
+      } else {
+        content = await readFileSync(filePath, 'utf8')
+        this.lock = 0
+      }
+      return content
+    } catch (e) {
+      this.lock = this.lock || 0
+      if (++this.lock > 10) {
+        this.lock = 0
+        return
+      }
+
+      const fileName = basename(filePath)
+
+      await this._loadFile(cwd(filePath, '../..', fileName))
+    }
+  }
+}

packages/docsify-server-renderer/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "docsify-server-renderer",
+  "version": "4.0.1",
+  "description": "docsify server renderer",
+  "author": {
+    "name": "qingwei-li",
+    "email": "cinwell.li@gmail.com",
+    "url": "https://github.com/QingWei-Li"
+  },
+  "homepage": "https://docsify.js.org",
+  "license": "MIT",
+  "repository": "QingWei-Li/docsify",
+  "main": "build.js",
+  "scripts": {
+    "test": "echo 'hello'"
+  },
+  "dependencies": {
+    "node-fetch": "^1.7.0"
+  }
+}

src/core/config.js

@@ -17,7 +17,10 @@ const config = merge({
   autoHeader: false,
   executeScript: null,
   noEmoji: false,
-  ga: ''
+  ga: '',
+  mergeNavbar: false,
+  formatUpdated: '',
+  externalLinkTarget: '_blank'
 }, window.$docsify)
 
 const script = document.currentScript ||

src/core/event/index.js

@@ -6,13 +6,13 @@ import { scrollIntoView } from './scroll'
 export function eventMixin (proto) {
   proto.$resetEvents = function () {
     scrollIntoView(this.route.query.id)
-    sidebar.getAndActive('nav')
+    sidebar.getAndActive(this.router, 'nav')
   }
 }
 
 export function initEvent (vm) {
   // Bind toggle button
-  sidebar.btn('button.sidebar-toggle')
+  sidebar.btn('button.sidebar-toggle', vm.router)
   // Bind sticky effect
   if (vm.config.coverpage) {
     !isMobile && on('scroll', sidebar.sticky)

src/core/event/scroll.js

@@ -1,6 +1,5 @@
 import { isMobile } from '../util/env'
 import * as dom from '../util/dom'
-import { parse } from '../route/hash'
 
 const nav = {}
 let hoverOver = false
@@ -53,7 +52,7 @@ function highlight () {
   }
 }
 
-export function scrollActiveSidebar () {
+export function scrollActiveSidebar (router) {
   if (isMobile) return
 
   const sidebar = dom.getNode('.sidebar')
@@ -66,7 +65,7 @@ export function scrollActiveSidebar () {
     let href = a.getAttribute('href')
 
     if (href !== '/') {
-      href = parse(href).query.id
+      href = router.parse(href).query.id
     }
 
     nav[decodeURIComponent(href)] = li

src/core/event/sidebar.js

@@ -1,23 +1,27 @@
 import { isMobile } from '../util/env'
 import * as dom from '../util/dom'
-import { getHash } from '../route/hash'
 
 const title = dom.$.title
 /**
  * Toggle button
  */
-export function btn (el) {
-  const toggle = () => dom.body.classList.toggle('close')
+export function btn (el, router) {
+  const toggle = _ => dom.body.classList.toggle('close')
 
   el = dom.getNode(el)
-  dom.on(el, 'click', toggle)
+  dom.on(el, 'click', e => {
+    e.stopPropagation()
+    toggle()
+  })
 
   const sidebar = dom.getNode('.sidebar')
 
-  dom.on(sidebar, 'click', () => {
-    isMobile && toggle()
-    setTimeout(() => getAndActive(sidebar, true, true), 0)
-  })
+  isMobile && dom.on(dom.body, 'click', _ =>
+    dom.body.classList.contains('close') && toggle()
+  )
+  dom.on(sidebar, 'click', _ =>
+    setTimeout((_ => getAndActive(router, sidebar, true, true), 0))
+  )
 }
 
 export function sticky () {
@@ -34,16 +38,17 @@ export function sticky () {
 
 /**
  * Get and active link
+ * @param  {object} router
  * @param  {string|element}  el
  * @param  {Boolean} isParent   acitve parent
  * @param  {Boolean} autoTitle  auto set title
  * @return {element}
  */
-export function getAndActive (el, isParent, autoTitle) {
+export function getAndActive (router, el, isParent, autoTitle) {
   el = dom.getNode(el)
 
   const links = dom.findAll(el, 'a')
-  const hash = '#' + getHash()
+  const hash = router.toURL(router.getCurrentPath())
   let target
 
   links

src/core/fetch/ajax.js

@@ -14,9 +14,10 @@ export function get (url, hasBar = false) {
   const on = function () {
     xhr.addEventListener.apply(xhr, arguments)
   }
+  const cached = cache[url]
 
-  if (cache[url]) {
-    return { then: cb => cb(cache[url]), abort: noop }
+  if (cached) {
+    return { then: cb => cb(cached.content, cached.opt), abort: noop }
   }
 
   xhr.open('GET', url)
@@ -41,8 +42,14 @@ export function get (url, hasBar = false) {
         if (target.status >= 400) {
           error(target)
         } else {
-          cache[url] = target.response
-          success(target.response)
+          const result = cache[url] = {
+            content: target.response,
+            opt: {
+              updatedAt: xhr.getResponseHeader('last-modified')
+            }
+          }
+
+          success(result.content, result.opt)
         }
       })
     },

src/core/fetch/index.js

@@ -1,7 +1,8 @@
 import { get } from './ajax'
 import { callHook } from '../init/lifecycle'
-import { getParentPath } from '../route/util'
+import { getParentPath } from '../router/util'
 import { noop } from '../util/core'
+import { getAndActive } from '../event/sidebar'
 
 function loadNested (path, file, next, vm, first) {
   path = first ? path : path.replace(/\/$/, '')
@@ -9,7 +10,7 @@ function loadNested (path, file, next, vm, first) {
 
   if (!path) return
 
-  get(vm.$getFile(path + file))
+  get(vm.router.getFile(path + file))
     .then(next, _ => loadNested(path, file, next, vm))
 }
 
@@ -22,14 +23,14 @@ export function fetchMixin (proto) {
     // Abort last request
     last && last.abort && last.abort()
 
-    last = get(this.$getFile(path), true)
+    last = get(this.router.getFile(path), true)
 
     // Current page is html
     this.isHTML = /\.html$/g.test(path)
 
     // Load main content
-    last.then(text => {
-      this._renderMain(text)
+    last.then((text, opt) => {
+      this._renderMain(text, opt)
       if (!loadSidebar) return cb()
 
       const fn = result => { this._renderSidebar(result); cb() }
@@ -47,8 +48,9 @@ export function fetchMixin (proto) {
   proto._fetchCover = function () {
     const { coverpage } = this.config
     const root = getParentPath(this.route.path)
-    const path = this.$getFile(root + coverpage)
+    const path = this.router.getFile(root + coverpage)
 
+    console.log(this.route.path, root, path)
     if (this.route.path !== '/' || !coverpage) {
       this._renderCover()
       return
@@ -70,5 +72,20 @@ export function fetchMixin (proto) {
 }
 
 export function initFetch (vm) {
-  vm.$fetch(_ => callHook(vm, 'ready'))
+  const { loadSidebar } = vm.config
+
+  // server-client renderer
+  if (vm.rendered) {
+    const activeEl = getAndActive(vm.router, '.sidebar-nav', true, true)
+    if (loadSidebar && activeEl) {
+      activeEl.parentNode.innerHTML += window.__SUB_SIDEBAR__
+    }
+    vm._bindEventOnRendered(activeEl)
+    vm._fetchCover()
+    vm.$resetEvents()
+    callHook(vm, 'doneEach')
+    callHook(vm, 'ready')
+  } else {
+    vm.$fetch(_ => callHook(vm, 'ready'))
+  }
 }

src/core/global-api.js

@@ -1,14 +1,14 @@
 import * as util from './util'
 import * as dom from './util/dom'
-import * as render from './render/compiler'
-import * as route from './route/hash'
+import { Compiler } from './render/compiler'
 import { slugify } from './render/slugify'
 import { get } from './fetch/ajax'
 import marked from 'marked'
 import prism from 'prismjs'
 
 export default function () {
-  window.Docsify = { util, dom, render, route, get, slugify }
+  window.Docsify = { util, dom, get, slugify }
+  window.DocsifyCompiler = Compiler
   window.marked = marked
   window.Prism = prism
 }

src/core/index.js

@@ -1,5 +1,5 @@
 import { initMixin } from './init'
-import { routeMixin } from './route'
+import { routerMixin } from './router'
 import { renderMixin } from './render'
 import { fetchMixin } from './fetch'
 import { eventMixin } from './event'
@@ -12,7 +12,7 @@ function Docsify () {
 const proto = Docsify.prototype
 
 initMixin(proto)
-routeMixin(proto)
+routerMixin(proto)
 renderMixin(proto)
 fetchMixin(proto)
 eventMixin(proto)

src/core/init/index.js

@@ -1,7 +1,7 @@
 import config from '../config'
 import { initLifecycle, callHook } from './lifecycle'
 import { initRender } from '../render'
-import { initRoute } from '../route'
+import { initRouter } from '../router'
 import { initEvent } from '../event'
 import { initFetch } from '../fetch'
 import { isFn } from '../util/core'
@@ -14,9 +14,9 @@ export function initMixin (proto) {
     initLifecycle(vm) // Init hooks
     initPlugin(vm) // Install plugins
     callHook(vm, 'init')
+    initRouter(vm) // Add router
     initRender(vm) // Render base DOM
     initEvent(vm) // Bind events
-    initRoute(vm) // Add hashchange eventListener
     initFetch(vm) // Fetch data
     callHook(vm, 'mounted')
   }

src/core/render/compiler.js

@@ -4,155 +4,165 @@ import { helper as helperTpl, tree as treeTpl } from './tpl'
 import { genTree } from './gen-tree'
 import { slugify } from './slugify'
 import { emojify } from './emojify'
-import { toURL, parse } from '../route/hash'
-import { getBasePath, isAbsolutePath, getPath } from '../route/util'
+import { isAbsolutePath, getPath } from '../router/util'
 import { isFn, merge, cached } from '../util/core'
 
-let markdownCompiler = marked
-let contentBase = ''
-let currentPath = ''
-let renderer = new marked.Renderer()
-const cacheTree = {}
-let toc = []
+export class Compiler {
+  constructor (config, router) {
+    this.config = config
+    this.router = router
+    this.cacheTree = {}
+    this.toc = []
+    this.linkTarget = config.externalLinkTarget || '_blank'
+    this.contentBase = router.getBasePath()
 
-/**
- * Compile markdown content
- */
-export const markdown = cached(text => {
-  let html = ''
+    const renderer = this._initRenderer()
+    let compile
+    const mdConf = config.markdown || {}
 
-  if (!text) return text
+    if (isFn(mdConf)) {
+      compile = mdConf(marked, renderer)
+    } else {
+      marked.setOptions(merge(mdConf, {
+        renderer: merge(renderer, mdConf.renderer)
+      }))
+      compile = marked
+    }
 
-  html = markdownCompiler(text)
-  html = emojify(html)
-  slugify.clear()
+    this.compile = cached(text => {
+      let html = ''
 
-  return html
-})
+      if (!text) return text
 
-markdown.renderer = renderer
+      html = compile(text)
+      html = config.noEmoji ? html : emojify(html)
+      slugify.clear()
 
-markdown.init = function (config = {}, base = window.location.pathname) {
-  contentBase = getBasePath(base)
-
-  if (isFn(config)) {
-    markdownCompiler = config(marked, renderer)
-  } else {
-    renderer = merge(renderer, config.renderer)
-    marked.setOptions(merge(config, { renderer }))
-  }
-}
-
-markdown.update = function () {
-  currentPath = parse().path
-}
-
-/**
- * render anchor tag
- * @link https://github.com/chjj/marked#overriding-renderer-methods
- */
-renderer.heading = function (text, level) {
-  const nextToc = { level, title: text }
-
-  if (/{docsify-ignore}/g.test(text)) {
-    text = text.replace('{docsify-ignore}', '')
-    nextToc.title = text
-    nextToc.ignoreSubHeading = true
+      return html
+    })
   }
 
-  if (/{docsify-ignore-all}/g.test(text)) {
-    text = text.replace('{docsify-ignore-all}', '')
-    nextToc.title = text
-    nextToc.ignoreAllSubs = true
+  _initRenderer () {
+    const renderer = new marked.Renderer()
+    const { linkTarget, router, toc, contentBase } = this
+    /**
+     * render anchor tag
+     * @link https://github.com/chjj/marked#overriding-renderer-methods
+     */
+    renderer.heading = function (text, level) {
+      const nextToc = { level, title: text }
+
+      if (/{docsify-ignore}/g.test(text)) {
+        text = text.replace('{docsify-ignore}', '')
+        nextToc.title = text
+        nextToc.ignoreSubHeading = true
+      }
+
+      if (/{docsify-ignore-all}/g.test(text)) {
+        text = text.replace('{docsify-ignore-all}', '')
+        nextToc.title = text
+        nextToc.ignoreAllSubs = true
+      }
+
+      const slug = slugify(text)
+      const url = router.toURL(router.getCurrentPath(), { id: slug })
+      nextToc.slug = url
+      toc.push(nextToc)
+
+      return `<h${level} id="${slug}"><a href="${url}" data-id="${slug}" class="anchor"><span>${text}</span></a></h${level}>`
+    }
+    // highlight code
+    renderer.code = function (code, lang = '') {
+      const hl = Prism.highlight(code, Prism.languages[lang] || Prism.languages.markup)
+
+      return `<pre v-pre data-lang="${lang}"><code class="lang-${lang}">${hl}</code></pre>`
+    }
+    renderer.link = function (href, title, text) {
+      let blank = ''
+      if (!/:|(\/{2})/.test(href)) {
+        href = router.toURL(href, null, router.getCurrentPath())
+      } else {
+        blank = ` target="${linkTarget}"`
+      }
+      if (title) {
+        title = ` title="${title}"`
+      }
+      return `<a href="${href}"${title || ''}${blank}>${text}</a>`
+    }
+    renderer.paragraph = function (text) {
+      if (/^!&gt;/.test(text)) {
+        return helperTpl('tip', text)
+      } else if (/^\?&gt;/.test(text)) {
+        return helperTpl('warn', text)
+      }
+      return `<p>${text}</p>`
+    }
+    renderer.image = function (href, title, text) {
+      let url = href
+      const titleHTML = title ? ` title="${title}"` : ''
+
+      if (!isAbsolutePath(href)) {
+        url = getPath(contentBase, href)
+      }
+
+      return `<img src="${url}" data-origin="${href}" alt="${text}"${titleHTML}>`
+    }
+
+    return renderer
   }
 
-  const slug = slugify(text)
-  const url = toURL(currentPath, { id: slug })
-  nextToc.slug = url
-  toc.push(nextToc)
+  /**
+   * Compile sidebar
+   */
+  sidebar (text, level) {
+    const currentPath = this.router.getCurrentPath()
+    let html = ''
 
-  return `<h${level} id="${slug}"><a href="${url}" data-id="${slug}" class="anchor"><span>${text}</span></a></h${level}>`
-}
-// highlight code
-renderer.code = function (code, lang = '') {
-  const hl = Prism.highlight(code, Prism.languages[lang] || Prism.languages.markup)
+    if (text) {
+      html = this.compile(text)
+      html = html && html.match(/<ul[^>]*>([\s\S]+)<\/ul>/g)[0]
+    } else {
+      const tree = this.cacheTree[currentPath] || genTree(this.toc, level)
+      html = treeTpl(tree, '<ul>')
+      this.cacheTree[currentPath] = tree
+    }
 
-  return `<pre v-pre data-lang="${lang}"><code class="lang-${lang}">${hl}</code></pre>`
-}
-renderer.link = function (href, title, text) {
-  let blank = ''
-  if (!/:|(\/{2})/.test(href)) {
-    href = toURL(href)
-  } else {
-    blank = ' target="_blank"'
-  }
-  if (title) {
-    title = ` title="${title}"`
-  }
-  return `<a href="${href}"${title || ''}${blank}>${text}</a>`
-}
-renderer.paragraph = function (text) {
-  if (/^!&gt;/.test(text)) {
-    return helperTpl('tip', text)
-  } else if (/^\?&gt;/.test(text)) {
-    return helperTpl('warn', text)
-  }
-  return `<p>${text}</p>`
-}
-renderer.image = function (href, title, text) {
-  let url = href
-  const titleHTML = title ? ` title="${title}"` : ''
-
-  if (!isAbsolutePath(href)) {
-    url = getPath(contentBase, href)
+    return html
   }
 
-  return `<img src="${url}" data-origin="${href}" alt="${text}"${titleHTML}>`
-}
+  /**
+   * Compile sub sidebar
+   */
+  subSidebar (level) {
+    const currentPath = this.router.getCurrentPath()
+    const { cacheTree, toc } = this
 
-/**
- * Compile sidebar
- */
-export function sidebar (text, level) {
-  let html = ''
-
-  if (text) {
-    html = markdown(text)
-    html = html.match(/<ul[^>]*>([\s\S]+)<\/ul>/g)[0]
-  } else {
-    const tree = cacheTree[currentPath] || genTree(toc, level)
-    html = treeTpl(tree, '<ul>')
-    cacheTree[currentPath] = tree
-  }
-
-  return html
-}
-
-/**
- * Compile sub sidebar
- */
-export function subSidebar (el, level) {
-  if (el) {
-    toc[0] && toc[0].ignoreAllSubs && (toc = [])
+    toc[0] && toc[0].ignoreAllSubs && (this.toc = [])
     toc[0] && toc[0].level === 1 && toc.shift()
     toc.forEach((node, i) => {
       node.ignoreSubHeading && toc.splice(i, 1)
     })
+
     const tree = cacheTree[currentPath] || genTree(toc, level)
-    el.parentNode.innerHTML += treeTpl(tree, '<ul class="app-sub-sidebar">')
+
     cacheTree[currentPath] = tree
+    this.toc = []
+    return treeTpl(tree, '<ul class="app-sub-sidebar">')
   }
-  toc = []
-}
 
-/**
- * Compile cover page
- */
-export function cover (text) {
-  const cacheToc = toc.slice()
-  const html = markdown(text)
+  article (text) {
+    return this.compile(text)
+  }
 
-  toc = cacheToc.slice()
+  /**
+   * Compile cover page
+   */
+  cover (text) {
+    const cacheToc = this.toc.slice()
+    const html = this.compile(text)
 
-  return html
+    this.toc = cacheToc.slice()
+
+    return html
+  }
 }

src/core/render/emojify.js

@@ -1,10 +1,12 @@
+import { inBrowser } from '../util/env'
+
 function replace (m, $1) {
   return '<img class="emoji" src="https://assets-cdn.github.com/images/icons/emoji/' + $1 + '.png" alt="' + $1 + '" />'
 }
 
 export function emojify (text) {
-  return $docsify.noEmoji ? text : text
+  return text
     .replace(/<(pre|template|code)[^>]*?>[\s\S]+?<\/(pre|template|code)>/g, m => m.replace(/:/g, '__colon__'))
-    .replace(/:(\w+?):/ig, window.emojify || replace)
+    .replace(/:(\w+?):/ig, (inBrowser && window.emojify) || replace)
     .replace(/__colon__/g, ':')
 }

src/core/render/index.js

@@ -1,12 +1,14 @@
 import * as dom from '../util/dom'
-import { getAndActive, sticky } from '../event/sidebar'
-import { scrollActiveSidebar, scroll2Top } from '../event/scroll'
-import cssVars from '../util/polyfill/css-vars'
 import * as tpl from './tpl'
-import { markdown, sidebar, subSidebar, cover } from './compiler'
+import cssVars from '../util/polyfill/css-vars'
+import tinydate from 'tinydate'
 import { callHook } from '../init/lifecycle'
-import { getBasePath, getPath, isAbsolutePath } from '../route/util'
+import { Compiler } from './compiler'
+import { getAndActive, sticky } from '../event/sidebar'
+import { getPath, isAbsolutePath } from '../router/util'
+import { isMobile } from '../util/env'
 import { isPrimitive } from '../util/core'
+import { scrollActiveSidebar, scroll2Top } from '../event/scroll'
 
 function executeScript () {
   const script = dom.findAll('.markdown-section>script')
@@ -20,6 +22,16 @@ function executeScript () {
   }, 0)
 }
 
+function formatUpdated (html, updated, fn) {
+  updated = typeof fn === 'function'
+    ? fn(updated)
+    : typeof fn === 'string'
+      ? tinydate(fn)(new Date(updated))
+      : updated
+
+  return html.replace(/{docsify-updated}/g, updated)
+}
+
 function renderMain (html) {
   if (!html) {
     // TODO: Custom 404 page
@@ -42,10 +54,6 @@ function renderMain (html) {
   } else {
     this.config.executeScript && executeScript()
   }
-
-  if (this.config.auto2top) {
-    scroll2Top(this.config.auto2top)
-  }
 }
 
 function renderNameLink (vm) {
@@ -58,7 +66,7 @@ function renderNameLink (vm) {
   if (isPrimitive(vm.config.nameLink)) {
     el.setAttribute('href', nameLink)
   } else if (typeof nameLink === 'object') {
-    const match = Object.keys(nameLink).find(key => path.indexOf(key) > -1)
+    const match = Object.keys(nameLink).filter(key => path.indexOf(key) > -1)[0]
 
     el.setAttribute('href', nameLink[match])
   }
@@ -71,34 +79,47 @@ export function renderMixin (proto) {
   }
 
   proto._renderSidebar = function (text) {
-    const { maxLevel, subMaxLevel, autoHeader, loadSidebar } = this.config
+    const { maxLevel, subMaxLevel, loadSidebar } = this.config
 
-    this._renderTo('.sidebar-nav', sidebar(text, maxLevel))
-    const active = getAndActive('.sidebar-nav', true, true)
-    subSidebar(loadSidebar ? active : '', subMaxLevel)
+    this._renderTo('.sidebar-nav', this.compiler.sidebar(text, maxLevel))
+    const activeEl = getAndActive(this.router, '.sidebar-nav', true, true)
+    if (loadSidebar && activeEl) {
+      activeEl.parentNode.innerHTML += this.compiler.subSidebar(subMaxLevel)
+    }
     // bind event
-    this.activeLink = active
-    scrollActiveSidebar()
+    this._bindEventOnRendered()
+  }
 
-    if (autoHeader && active) {
+  proto._bindEventOnRendered = function (activeEl) {
+    const { autoHeader, auto2top } = this.config
+
+    scrollActiveSidebar(this.router)
+
+    if (autoHeader && activeEl) {
       const main = dom.getNode('#main')
       const firstNode = main.children[0]
       if (firstNode && firstNode.tagName !== 'H1') {
         const h1 = dom.create('h1')
-        h1.innerText = active.innerText
+        h1.innerText = activeEl.innerText
         dom.before(main, h1)
       }
     }
+
+    auto2top && scroll2Top(auto2top)
   }
 
   proto._renderNav = function (text) {
-    text && this._renderTo('nav', markdown(text))
-    getAndActive('nav')
+    text && this._renderTo('nav', this.compiler.compile(text))
+    getAndActive(this.router, 'nav')
   }
 
-  proto._renderMain = function (text) {
+  proto._renderMain = function (text, opt = {}) {
     callHook(this, 'beforeEach', text, result => {
-      const html = this.isHTML ? result : markdown(result)
+      let html = this.isHTML ? result : this.compiler.compile(result)
+      if (opt.updatedAt) {
+        html = formatUpdated(html, opt.updatedAt, this.config.formatUpdated)
+      }
+
       callHook(this, 'afterEach', html, text => renderMain.call(this, text))
     })
   }
@@ -111,7 +132,7 @@ export function renderMixin (proto) {
     }
     dom.toggleClass(el, 'add', 'show')
 
-    let html = this.coverIsHTML ? text : cover(text)
+    let html = this.coverIsHTML ? text : this.compiler.cover(text)
     const m = html.trim().match('<p><img.*?data-origin="(.*?)"[^a]+alt="(.*?)">([^<]*?)</p>$')
 
     if (m) {
@@ -122,7 +143,7 @@ export function renderMixin (proto) {
 
         dom.toggleClass(el, 'add', 'has-mask')
         if (!isAbsolutePath(m[1])) {
-          path = getPath(getBasePath(this.config.basePath), m[1])
+          path = getPath(this.router.getBasePath(), m[1])
         }
         el.style.backgroundImage = `url(${path})`
         el.style.backgroundSize = 'cover'
@@ -136,7 +157,6 @@ export function renderMixin (proto) {
   }
 
   proto._updateRender = function () {
-    markdown.update()
     // render name link
     renderNameLink(this)
   }
@@ -146,35 +166,42 @@ export function initRender (vm) {
   const config = vm.config
 
   // Init markdown compiler
-  markdown.init(config.markdown, config.basePath)
+  vm.compiler = new Compiler(config, vm.router)
 
   const id = config.el || '#app'
   const navEl = dom.find('nav') || dom.create('nav')
 
-  let el = dom.find(id)
+  const el = dom.find(id)
   let html = ''
+  let navAppendToTarget = dom.body
 
-  navEl.classList.add('app-nav')
+  if (el) {
+    if (config.repo) {
+      html += tpl.corner(config.repo)
+    }
+    if (config.coverpage) {
+      html += tpl.cover()
+    }
 
-  if (!config.repo) {
-    navEl.classList.add('no-badge')
+    html += tpl.main(config)
+    // Render main app
+    vm._renderTo(el, html, true)
+  } else {
+    vm.rendered = true
   }
-  if (!el) {
-    el = dom.create(id)
-    dom.appendTo(dom.body, el)
-  }
-  if (config.repo) {
-    html += tpl.corner(config.repo)
-  }
-  if (config.coverpage) {
-    html += tpl.cover()
+
+  if (config.mergeNavbar && isMobile) {
+    navAppendToTarget = dom.find('.sidebar')
+  } else {
+    navEl.classList.add('app-nav')
+
+    if (!config.repo) {
+      navEl.classList.add('no-badge')
+    }
   }
 
-  html += tpl.main(config)
-  // Render main app
-  vm._renderTo(el, html, true)
   // Add nav
-  dom.before(dom.body, navEl)
+  dom.before(navAppendToTarget, navEl)
 
   if (config.themeColor) {
     dom.$.head.innerHTML += tpl.theme(config.themeColor)

src/core/render/tpl.js

@@ -33,12 +33,12 @@ export function main (config) {
       (config.name
         ? `<h1><a class="app-name-link" data-nosearch>${config.name}</a></h1>`
         : '') +
-      '<div class="sidebar-nav"></div>' +
+      '<div class="sidebar-nav"><!--sidebar--></div>' +
     '</aside>')
 
   return (isMobile ? `${aside}<main>` : `<main>${aside}`) +
       '<section class="content">' +
-        '<article class="markdown-section" id="main"></article>' +
+        '<article class="markdown-section" id="main"><!--main--></article>' +
       '</section>' +
     '</main>'
 }

src/core/route/hash.js

@@ -1,75 +0,0 @@
-import { merge, cached } from '../util/core'
-import { parseQuery, stringifyQuery, cleanPath } from './util'
-export * from './util'
-
-function replaceHash (path) {
-  const i = window.location.href.indexOf('#')
-  window.location.replace(
-    window.location.href.slice(0, i >= 0 ? i : 0) + '#' + path
-  )
-}
-
-const replaceSlug = cached(path => {
-  return path
-    .replace('#', '?id=')
-    .replace(/\?(\w+)=/g, (_, slug) => slug === 'id' ? '?id=' : `&${slug}=`)
-})
-/**
- * Normalize the current url
- *
- * @example
- * domain.com/docs/ => domain.com/docs/#/
- * domain.com/docs/#/#slug => domain.com/docs/#/?id=slug
- */
-export function normalize () {
-  let path = getHash()
-
-  path = replaceSlug(path)
-
-  if (path.charAt(0) === '/') return replaceHash(path)
-  replaceHash('/' + path)
-}
-
-export function getHash () {
-  // We can't use window.location.hash here because it's not
-  // consistent across browsers - Firefox will pre-decode it!
-  const href = window.location.href
-  const index = href.indexOf('#')
-  return index === -1 ? '' : href.slice(index + 1)
-}
-
-/**
- * Parse the url
- * @param {string} [path=window.location.herf]
- * @return {object} { path, query }
- */
-export function parse (path = window.location.href) {
-  let query = ''
-
-  const queryIndex = path.indexOf('?')
-  if (queryIndex >= 0) {
-    query = path.slice(queryIndex + 1)
-    path = path.slice(0, queryIndex)
-  }
-
-  const hashIndex = path.indexOf('#')
-  if (hashIndex) {
-    path = path.slice(hashIndex + 1)
-  }
-
-  return { path, query: parseQuery(query) }
-}
-
-/**
- * to URL
- * @param  {string} path
- * @param  {object} qs   query params
- */
-export function toURL (path, params) {
-  const route = parse(replaceSlug(path))
-
-  route.query = merge({}, route.query, params)
-  path = route.path + stringifyQuery(route.query)
-
-  return cleanPath('#/' + path)
-}

src/core/route/index.js

@@ -1,52 +0,0 @@
-import { normalize, parse } from './hash'
-import { getBasePath, getPath, isAbsolutePath } from './util'
-import { on } from '../util/dom'
-
-function getAlias (path, alias) {
-  return alias[path] ? getAlias(alias[path], alias) : path
-}
-
-function getFileName (path) {
-  return /\.(md|html)$/g.test(path)
-    ? path
-    : /\/$/g.test(path)
-      ? `${path}README.md`
-      : `${path}.md`
-}
-
-export function routeMixin (proto) {
-  proto.route = {}
-  proto.$getFile = function (path) {
-    const { config } = this
-    const base = getBasePath(config.basePath)
-
-    path = config.alias ? getAlias(path, config.alias) : path
-    path = getFileName(path)
-    path = path === '/README.md' ? (config.homepage || path) : path
-    path = isAbsolutePath(path) ? path : getPath(base, path)
-
-    return path
-  }
-}
-
-let lastRoute = {}
-
-export function initRoute (vm) {
-  normalize()
-  lastRoute = vm.route = parse()
-  vm._updateRender()
-
-  on('hashchange', _ => {
-    normalize()
-    vm.route = parse()
-    vm._updateRender()
-
-    if (lastRoute.path === vm.route.path) {
-      vm.$resetEvents()
-      return
-    }
-
-    vm.$fetch()
-    lastRoute = vm.route
-  })
-}

src/core/router/history/abstract.js

@@ -0,0 +1,35 @@
+import { History } from './base'
+import { parseQuery, stringifyQuery, cleanPath } from '../util'
+import { merge } from '../../util/core'
+
+export class AbstractHistory extends History {
+  constructor (config) {
+    super(config)
+    this.mode = 'abstract'
+  }
+
+  parse (path) {
+    let query = ''
+
+    const queryIndex = path.indexOf('?')
+    if (queryIndex >= 0) {
+      query = path.slice(queryIndex + 1)
+      path = path.slice(0, queryIndex)
+    }
+
+    return { path, query: parseQuery(query) }
+  }
+
+  toURL (path, params, currentRoute) {
+    const local = currentRoute && path[0] === '#'
+    const route = this.parse(path)
+
+    route.query = merge({}, route.query, params)
+    path = route.path + stringifyQuery(route.query)
+    path = path.replace(/\.md(\?)|\.md$/, '$1')
+
+    if (local) path = currentRoute + path
+
+    return cleanPath('/' + path)
+  }
+}

src/core/router/history/base.js

@@ -0,0 +1,48 @@
+import { getPath, isAbsolutePath } from '../util'
+import { noop } from '../../util/core'
+
+function getAlias (path, alias) {
+  return alias[path] ? getAlias(alias[path], alias) : path
+}
+
+function getFileName (path) {
+  return /\.(md|html)$/g.test(path)
+    ? path
+    : /\/$/g.test(path)
+      ? `${path}README.md`
+      : `${path}.md`
+}
+
+export class History {
+  constructor (config) {
+    this.config = config
+  }
+
+  getBasePath () {
+    return this.config.basePath
+  }
+
+  getFile (path) {
+    const { config } = this
+    const base = this.getBasePath()
+
+    path = config.alias ? getAlias(path, config.alias) : path
+    path = getFileName(path)
+    path = path === '/README.md' ? (config.homepage || path) : path
+    path = isAbsolutePath(path) ? path : getPath(base, path)
+
+    return path
+  }
+
+  onchange (cb = noop) {
+    cb()
+  }
+
+  getCurrentPath () {}
+
+  normalize () {}
+
+  parse () {}
+
+  toURL () {}
+}

src/core/router/history/hash.js

@@ -0,0 +1,87 @@
+import { History } from './base'
+import { merge, cached, noop } from '../../util/core'
+import { on } from '../../util/dom'
+import { parseQuery, stringifyQuery, cleanPath } from '../util'
+
+function replaceHash (path) {
+  const i = location.href.indexOf('#')
+  location.replace(
+    location.href.slice(0, i >= 0 ? i : 0) + '#' + path
+  )
+}
+
+const replaceSlug = cached(path => {
+  return path.replace('#', '?id=')
+})
+
+export class HashHistory extends History {
+  constructor (config) {
+    super(config)
+    this.mode = 'hash'
+  }
+
+  getBasePath () {
+    const path = window.location.pathname || ''
+    const base = this.config.basePath
+
+    return /^(\/|https?:)/g.test(base)
+      ? base
+      : cleanPath(path + '/' + base)
+  }
+
+  getCurrentPath () {
+    // We can't use location.hash here because it's not
+    // consistent across browsers - Firefox will pre-decode it!
+    const href = location.href
+    const index = href.indexOf('#')
+    return index === -1 ? '' : href.slice(index + 1)
+  }
+
+  onchange (cb = noop) {
+    on('hashchange', cb)
+  }
+
+  normalize () {
+    let path = this.getCurrentPath()
+
+    path = replaceSlug(path)
+
+    if (path.charAt(0) === '/') return replaceHash(path)
+    replaceHash('/' + path)
+  }
+
+  /**
+   * Parse the url
+   * @param {string} [path=location.herf]
+   * @return {object} { path, query }
+   */
+  parse (path = location.href) {
+    let query = ''
+
+    const queryIndex = path.indexOf('?')
+    if (queryIndex >= 0) {
+      query = path.slice(queryIndex + 1)
+      path = path.slice(0, queryIndex)
+    }
+
+    const hashIndex = path.indexOf('#')
+    if (hashIndex) {
+      path = path.slice(hashIndex + 1)
+    }
+
+    return { path, query: parseQuery(query) }
+  }
+
+  toURL (path, params, currentRoute) {
+    const local = currentRoute && path[0] === '#'
+    const route = this.parse(replaceSlug(path))
+
+    route.query = merge({}, route.query, params)
+    path = route.path + stringifyQuery(route.query)
+    path = path.replace(/\.md(\?)|\.md$/, '$1')
+
+    if (local) path = currentRoute + path
+
+    return cleanPath('#/' + path)
+  }
+}

src/core/router/history/html5.js

@@ -0,0 +1,83 @@
+import { History } from './base'
+import { merge, noop } from '../../util/core'
+import { on } from '../../util/dom'
+import { parseQuery, stringifyQuery, cleanPath } from '../util'
+
+export class HTML5History extends History {
+  constructor (config) {
+    super(config)
+    this.mode = 'history'
+  }
+
+  getCurrentPath () {
+    const base = this.config.basePath
+    let path = window.location.pathname
+
+    if (base && path.indexOf(base) === 0) {
+      path = path.slice(base.length)
+    }
+
+    return (path || '/') + window.location.search + window.location.hash
+  }
+
+  onchange (cb = noop) {
+    on('click', e => {
+      const el = e.target.tagName === 'A'
+        ? e.target
+        : e.target.parentNode
+
+      if (el.tagName === 'A' && !/_blank/.test(el.target)) {
+        e.preventDefault()
+        const url = el.href
+        window.history.pushState({ key: url }, '', url)
+        cb()
+      }
+    })
+
+    on('popstate', cb)
+  }
+
+  normalize () {
+    let path = this.getCurrentPath()
+
+    path = path.replace('#', '?id=')
+    window.history.pushState({ key: path }, '', path)
+
+    return path
+  }
+
+  /**
+   * Parse the url
+   * @param {string} [path=location.href]
+   * @return {object} { path, query }
+   */
+  parse (path = location.href) {
+    let query = ''
+
+    const queryIndex = path.indexOf('?')
+    if (queryIndex >= 0) {
+      query = path.slice(queryIndex + 1)
+      path = path.slice(0, queryIndex)
+    }
+
+    const baseIndex = path.indexOf(location.origin)
+    if (baseIndex > -1) {
+      path = path.slice(baseIndex + location.origin.length)
+    }
+
+    return { path, query: parseQuery(query) }
+  }
+
+  toURL (path, params, currentRoute) {
+    const local = currentRoute && path[0] === '#'
+    const route = this.parse(path)
+
+    route.query = merge({}, route.query, params)
+    path = route.path + stringifyQuery(route.query)
+    path = path.replace(/\.md(\?)|\.md$/, '$1')
+
+    if (local) path = currentRoute + path
+
+    return cleanPath('/' + path)
+  }
+}

src/core/router/index.js

@@ -0,0 +1,41 @@
+import { HashHistory } from './history/hash'
+import { HTML5History } from './history/html5'
+import { supportsPushState } from '../util/env'
+
+export function routerMixin (proto) {
+  proto.route = {}
+}
+
+let lastRoute = {}
+
+export function initRouter (vm) {
+  const config = vm.config
+  const mode = config.routerMode || 'hash'
+  let router
+
+  if (mode === 'history' && supportsPushState) {
+    router = new HTML5History(config)
+  } else {
+    router = new HashHistory(config)
+  }
+
+  vm.router = router
+
+  router.normalize()
+  lastRoute = vm.route = router.parse()
+  vm._updateRender()
+
+  router.onchange(_ => {
+    router.normalize()
+    vm.route = router.parse()
+    vm._updateRender()
+
+    if (lastRoute.path === vm.route.path) {
+      vm.$resetEvents()
+      return
+    }
+
+    vm.$fetch()
+    lastRoute = vm.route
+  })
+}

src/core/router/util.js

@@ -31,12 +31,6 @@ export function stringifyQuery (obj) {
   return qs.length ? `?${qs.join('&')}` : ''
 }
 
-export const getBasePath = cached(base => {
-  return /^(\/|https?:)/g.test(base)
-    ? base
-    : cleanPath(window.location.pathname + '/' + base)
-})
-
 export function getPath (...args) {
   return cleanPath(args.join('/'))
 }
@@ -54,5 +48,7 @@ export const getParentPath = cached(path => {
 })
 
 export const cleanPath = cached(path => {
-  return path.replace(/\/+/g, '/')
+  return path
+    .replace(/^\/+/, '/')
+    .replace(/([^:])\/{2,}/g, '$1/')
 })

src/core/util/env.js

@@ -1,5 +1,15 @@
-export const UA = window.navigator.userAgent.toLowerCase()
+export const inBrowser = typeof window !== 'undefined'
 
-export const isIE = UA && /msie|trident/.test(UA)
+export const isMobile = inBrowser && document.body.clientWidth <= 600
 
-export const isMobile = document.body.clientWidth <= 600
+/**
+ * @see https://github.com/MoOx/pjax/blob/master/lib/is-supported.js
+ */
+export const supportsPushState = inBrowser && (function () {
+  // Borrowed wholesale from https://github.com/defunkt/jquery-pjax
+  return window.history &&
+    window.history.pushState &&
+    window.history.replaceState &&
+    // pushState isn’t reliable on iOS until 5.
+    !navigator.userAgent.match(/((iPod|iPhone|iPad).+\bOS\s+[1-4]\D|WebApps\/.+CFNetwork)/)
+})()

src/core/util/index.js

@@ -1,2 +1,3 @@
 export * from './core'
 export * from './env'
+export * from '../router/util'

src/plugins/external-script.js

@@ -1,16 +1,20 @@
 function handleExternalScript () {
   const container = Docsify.dom.getNode('#main')
-  const script = Docsify.dom.find(container, 'script')
+  const scripts = Docsify.dom.findAll(container, 'script')
 
-  if (script && script.src) {
-    const newScript = document.createElement('script')
+  for (let i = scripts.length; i--;) {
+    const script = scripts[i]
 
-    ;['src', 'async', 'defer'].forEach(attribute => {
-      newScript[attribute] = script[attribute]
-    })
+    if (script && script.src) {
+      const newScript = document.createElement('script')
 
-    script.parentNode.insertBefore(newScript, script)
-    script.parentNode.removeChild(script)
+      Array.prototype.slice.call(script.attributes).forEach(attribute => {
+        newScript[attribute.name] = attribute.value
+      })
+
+      script.parentNode.insertBefore(newScript, script)
+      script.parentNode.removeChild(script)
+    }
   }
 }
 

src/plugins/ga.js

@@ -7,24 +7,28 @@ function appendScript () {
 }
 
 function init (id) {
-  if (!window.ga) {
+  let ga = window.ga
+
+  if (!ga) {
     appendScript()
-    window.ga = window.ga || function () {
-      (window.ga.q = window.ga.q || []).push(arguments)
+    ga = ga || function () {
+      (ga.q = ga.q || []).push(arguments)
     }
-    window.ga.l = Number(new Date())
-    window.ga('create', id, 'auto')
+    ga.l = Number(new Date())
+    ga('create', id, 'auto')
   }
+  return ga
 }
 
 function collect () {
-  init(window.$docsify.ga)
-  window.ga('set', 'page', location.href)
-  window.ga('send', 'pageview')
+  const ga = init($docsify.ga)
+
+  ga('set', 'page', location.hash)
+  ga('send', 'pageview')
 }
 
 const install = function (hook) {
-  if (!window.$docsify.ga) {
+  if (!$docsify.ga) {
     console.error('[Docsify] ga is required.')
     return
   }
@@ -32,4 +36,4 @@ const install = function (hook) {
   hook.beforeEach(collect)
 }
 
-window.$docsify.plugins = [].concat(install, window.$docsify.plugins)
+$docsify.plugins = [].concat(install, $docsify.plugins)

src/plugins/search/component.js

@@ -1,6 +1,5 @@
 import { search } from './search'
 
-let dom
 let NO_DATA_TEXT = ''
 
 function style () {
@@ -30,6 +29,9 @@ function style () {
   padding: 7px;
   line-height: 22px;
   font-size: 14px;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
 }
 
 .search h2 {
@@ -62,63 +64,67 @@ function style () {
 .search p.empty {
   text-align: center;
 }`
-  const style = dom.create('style', code)
-  dom.appendTo(dom.head, style)
+  const style = Docsify.dom.create('style', code)
+  Docsify.dom.appendTo(Docsify.dom.head, style)
 }
 
-function tpl (opts) {
+function tpl (opts, defaultValue = '') {
   const html =
-    `<input type="search" />` +
+    `<input type="search" value="${defaultValue}" />` +
       '<div class="results-panel"></div>' +
     '</div>'
-  const el = dom.create('div', html)
-  const aside = dom.find('aside')
+  const el = Docsify.dom.create('div', html)
+  const aside = Docsify.dom.find('aside')
 
-  dom.toggleClass(el, 'search')
-  dom.before(aside, el)
+  Docsify.dom.toggleClass(el, 'search')
+  Docsify.dom.before(aside, el)
+}
+
+function doSearch (value) {
+  const $search = Docsify.dom.find('div.search')
+  const $panel = Docsify.dom.find($search, '.results-panel')
+
+  if (!value) {
+    $panel.classList.remove('show')
+    $panel.innerHTML = ''
+    return
+  }
+  const matchs = search(value)
+
+  let html = ''
+  matchs.forEach(post => {
+    html += `<div class="matching-post">
+<h2><a href="${post.url}">${post.title}</a></h2>
+<p>${post.content}</p>
+</div>`
+  })
+
+  $panel.classList.add('show')
+  $panel.innerHTML = html || `<p class="empty">${NO_DATA_TEXT}</p>`
 }
 
 function bindEvents () {
-  const $search = dom.find('div.search')
-  const $input = dom.find($search, 'input')
-  const $panel = dom.find($search, '.results-panel')
-  const doSearch = function (value) {
-    if (!value) {
-      $panel.classList.remove('show')
-      $panel.innerHTML = ''
-      return
-    }
-    const matchs = search(value)
-
-    let html = ''
-    matchs.forEach(post => {
-      html += `<div class="matching-post">
-  <h2><a href="${post.url}">${post.title}</a></h2>
-  <p>${post.content}</p>
-</div>`
-    })
-
-    $panel.classList.add('show')
-    $panel.innerHTML = html || `<p class="empty">${NO_DATA_TEXT}</p>`
-  }
+  const $search = Docsify.dom.find('div.search')
+  const $input = Docsify.dom.find($search, 'input')
 
   let timeId
   // Prevent to Fold sidebar
-  dom.on($search, 'click',
+  Docsify.dom.on($search, 'click',
     e => e.target.tagName !== 'A' && e.stopPropagation())
-  dom.on($input, 'input', e => {
+  Docsify.dom.on($input, 'input', e => {
     clearTimeout(timeId)
     timeId = setTimeout(_ => doSearch(e.target.value.trim()), 100)
   })
 }
 
 function updatePlaceholder (text, path) {
-  const $input = dom.getNode('.search input[type="search"]')
+  const $input = Docsify.dom.getNode('.search input[type="search"]')
 
+  if (!$input) return
   if (typeof text === 'string') {
     $input.placeholder = text
   } else {
-    const match = Object.keys(text).find(key => path.indexOf(key) > -1)
+    const match = Object.keys(text).filter(key => path.indexOf(key) > -1)[0]
     $input.placeholder = text[match]
   }
 }
@@ -127,16 +133,18 @@ function updateNoData (text, path) {
   if (typeof text === 'string') {
     NO_DATA_TEXT = text
   } else {
-    const match = Object.keys(text).find(key => path.indexOf(key) > -1)
+    const match = Object.keys(text).filter(key => path.indexOf(key) > -1)[0]
     NO_DATA_TEXT = text[match]
   }
 }
 
-export function init (opts) {
-  dom = Docsify.dom
+export function init (opts, vm) {
+  const keywords = vm.router.parse().query.s
+
   style()
-  tpl(opts)
+  tpl(opts, keywords)
   bindEvents()
+  keywords && setTimeout(_ => doSearch(keywords), 500)
 }
 
 export function update (opts, vm) {

src/plugins/search/index.js

@@ -9,7 +9,7 @@ const CONFIG = {
 }
 
 const install = function (hook, vm) {
-  const util = Docsify.util
+  const { util } = Docsify
   const opts = vm.config.search || CONFIG
 
   if (Array.isArray(opts)) {
@@ -24,7 +24,7 @@ const install = function (hook, vm) {
   const isAuto = CONFIG.paths === 'auto'
 
   hook.mounted(_ => {
-    initComponet(CONFIG)
+    initComponet(CONFIG, vm)
     !isAuto && initSearch(CONFIG, vm)
   })
   hook.doneEach(_ => {
@@ -33,4 +33,4 @@ const install = function (hook, vm) {
   })
 }
 
-window.$docsify.plugins = [].concat(install, window.$docsify.plugins)
+$docsify.plugins = [].concat(install, $docsify.plugins)

src/plugins/search/search.js

@@ -14,18 +14,18 @@ function escapeHtml (string) {
   return String(string).replace(/[&<>"'\/]/g, s => entityMap[s])
 }
 
-function getAllPaths () {
+function getAllPaths (router) {
   const paths = []
 
   helper.dom.findAll('a:not([data-nosearch])')
     .map(node => {
       const href = node.href
       const originHref = node.getAttribute('href')
-      const path = helper.route.parse(href).path
+      const path = router.parse(href).path
 
       if (path &&
         paths.indexOf(path) === -1 &&
-        !helper.route.isAbsolutePath(originHref)) {
+        !Docsify.util.isAbsolutePath(originHref)) {
         paths.push(path)
       }
     })
@@ -38,16 +38,15 @@ function saveData (maxAge) {
   localStorage.setItem('docsify.search.index', JSON.stringify(INDEXS))
 }
 
-export function genIndex (path, content = '') {
+export function genIndex (path, content = '', router) {
   const tokens = window.marked.lexer(content)
   const slugify = window.Docsify.slugify
-  const toURL = Docsify.route.toURL
   const index = {}
   let slug
 
   tokens.forEach(token => {
     if (token.type === 'heading' && token.depth <= 2) {
-      slug = toURL(path, { id: slugify(token.text) })
+      slug = router.toURL(path, { id: slugify(token.text) })
       index[slug] = { slug, title: token.text, body: '' }
     } else {
       if (!slug) return
@@ -73,7 +72,7 @@ export function search (keywords) {
     data = data.concat(Object.keys(INDEXS[key]).map(page => INDEXS[key][page]))
   })
 
-  keywords = keywords.trim().split(/[\s\-\，\\/]+/)
+  keywords = [].concat(keywords, keywords.trim().split(/[\s\-\，\\/]+/))
 
   for (let i = 0; i < data.length; i++) {
     const post = data[i]
@@ -145,7 +144,7 @@ export function init (config, vm) {
     return
   }
 
-  const paths = isAuto ? getAllPaths() : config.paths
+  const paths = isAuto ? getAllPaths(vm.router) : config.paths
   const len = paths.length
   let count = 0
 
@@ -153,9 +152,9 @@ export function init (config, vm) {
     if (INDEXS[path]) return count++
 
     helper
-      .get(vm.$getFile(path))
+      .get(vm.router.getFile(path))
       .then(result => {
-        INDEXS[path] = genIndex(path, result)
+        INDEXS[path] = genIndex(path, result, vm.router)
         len === ++count && saveData(config.maxAge)
       })
   })

src/themes/basic/_layout.css

@@ -10,7 +10,7 @@
 body:not(.ready) {
   overflow: hidden;
 
-  [data-cloak], nav {
+  [data-cloak], .app-nav {
     display: none;
   }
 }
@@ -83,7 +83,7 @@ kbd {
 }
 
 /* navbar */
-nav.app-nav {
+.app-nav {
   left: 0;
   margin: 25px 60px 0 0;
   position: absolute;
@@ -238,6 +238,11 @@ main {
       color: inherit;
       text-decoration: none;
     }
+
+    .app-nav {
+      display: block;
+      position: static;
+    }
   }
 
   ul {
@@ -325,7 +330,7 @@ body.sticky {
 .markdown-section {
   margin: 0 auto;
   max-width: 800px;
-  padding: 20px 15px 40px 15px;
+  padding: 30px 15px 40px 15px;
   position: relative;
 
   > * {
@@ -425,16 +430,26 @@ body.close {
   }
 }
 
-@media (max-width: 600px) {
+@media print {
+  .github-corner, .sidebar-toggle, .sidebar {
+    display: none;
+  }
+
+  .app-nav {
+    display: none;
+  }
+}
+
+@media screen and (max-width: 768px) {
   .github-corner, .sidebar-toggle, .sidebar {
     position: fixed;
   }
 
-  nav {
+  .app-nav {
     margin-top: 16px;
   }
 
-  nav li ul {
+  .app-nav li ul {
     top: 30px;
   }
 
@@ -455,7 +470,7 @@ body.close {
     transition: transform 250ms ease;
   }
 
-  nav, .github-corner {
+  .app-nav, .github-corner {
     transition: transform 250ms ease-out;
   }
 
@@ -479,7 +494,7 @@ body.close {
       transform: translateX($sidebar-width);
     }
 
-    nav, .github-corner {
+    .app-nav, .github-corner {
       display: none;
     }
   }