Merged upstream develop and resolved the conflict

Author: vkallore

Diff for: .github/FUNDING.yml

@@ -0,0 +1,2 @@
+open_collective: docsify
+

Diff for: build/build.js

@@ -2,7 +2,7 @@ const rollup = require('rollup')
 const buble = require('rollup-plugin-buble')
 const commonjs = require('rollup-plugin-commonjs')
 const nodeResolve = require('rollup-plugin-node-resolve')
-const uglify = require('rollup-plugin-uglify')
+const { uglify } = require('rollup-plugin-uglify')
 const replace = require('rollup-plugin-replace')
 const isProd = process.env.NODE_ENV === 'production'
 const version = process.env.VERSION || require('../package.json').version

Diff for: docs/configuration.md

@@ -397,14 +397,27 @@ window.$docsify = {
 - type: `String`
 - default: `_blank`
 
-Target to open external links. Default `'_blank'` (new window/tab)
+Target to open external links inside the markdown. Default `'_blank'` (new window/tab)
 
 ```js
 window.$docsify = {
   externalLinkTarget: '_self' // default: '_blank'
 };
 ```
 
+## cornerExternalLinkTarget
+
+- type:`String`
+- default:`_blank`
+
+Target to open external link at the top right corner. Default `'_blank'` (new window/tab)
+
+```js
+window.$docsify = {
+  cornerExternalLinkTarget: '_self' // default: '_blank'
+};
+```
+
 ## externalLinkRel
 
 - type: `String`

Diff for: docs/deploy.md

@@ -88,6 +88,12 @@ When using the HTML5 router, you need to set up redirect rules that redirect all
 /*    /index.html   200
 ```
 
+## ZEIT Now
+
+1. Install [Now CLI](https://zeit.co/download), `npm i -g now`
+2. Change directory to your docsify website, for example `cd docs`
+3. Deploy with a single command, `now` 
+
 ## AWS Amplify
 
 1. Set the routerMode in the Docsify project `index.html` to *history* mode.