Release v5.0.0-rc.1

ava.config.js

@@ -1,3 +1,3 @@
-export default {
+module.exports = {
   files: ['e2e/**/*.test.js']
 }

e2e/cli.test.js.md

@@ -13,7 +13,6 @@ Generated by [AVA](https://avajs.dev).
     Commands:␊
       docsify init [path]      Creates new docs                         [aliases: i]␊
       docsify serve [path]     Run local server to preview site.        [aliases: s]␊
-      docsify start [path]     Server for SSR␊
       docsify generate [path]  Docsify's generators                     [aliases: g]␊
     ␊
     Global Options␊
@@ -38,7 +37,6 @@ Generated by [AVA](https://avajs.dev).
     Commands:␊
       docsify init [path]      Creates new docs                         [aliases: i]␊
       docsify serve [path]     Run local server to preview site.        [aliases: s]␊
-      docsify start [path]     Server for SSR␊
       docsify generate [path]  Docsify's generators                     [aliases: g]␊
     ␊
     Global Options␊
@@ -61,7 +59,6 @@ Generated by [AVA](https://avajs.dev).
     Commands:␊
       docsify init [path]      Creates new docs                         [aliases: i]␊
       docsify serve [path]     Run local server to preview site.        [aliases: s]␊
-      docsify start [path]     Server for SSR␊
       docsify generate [path]  Docsify's generators                     [aliases: g]␊
     ␊
     Global Options␊
@@ -81,7 +78,7 @@ Generated by [AVA](https://avajs.dev).
 
     `␊
     docsify-cli version:␊
-      4.4.4␊
+      5.0.0-rc.1␊
     `
 
 ## shows version information with --version flag
@@ -90,7 +87,7 @@ Generated by [AVA](https://avajs.dev).
 
     `␊
     docsify-cli version:␊
-      4.4.4␊
+      5.0.0-rc.1␊
     `
 
 ## rejects promise due to error on passing in an unknown command
@@ -102,7 +99,6 @@ Generated by [AVA](https://avajs.dev).
     Commands:␊
       docsify init [path]      Creates new docs                         [aliases: i]␊
       docsify serve [path]     Run local server to preview site.        [aliases: s]␊
-      docsify start [path]     Server for SSR␊
       docsify generate [path]  Docsify's generators                     [aliases: g]␊
     ␊
     Global Options␊

lib/cli.js

@@ -1,11 +1,8 @@
 const chalk = require('chalk')
-const updateNotifier = require('update-notifier')
 
 const pkg = require('../package.json')
 const run = require('../lib')
 
-updateNotifier({pkg: pkg}).notify()
-
 const Locales = require('../tools/locales')
 const y18n = new Locales()
 
@@ -37,7 +34,7 @@ require('yargs')
           alias: 't',
           default: 'vue',
           desc: chalk.gray(y18n.__('init.theme')),
-          choices: ['vue', 'buble', 'dark', 'pure'],
+          choices: ['vue'],
           nargs: 1,
           requiresArg: true,
           type: 'string'
@@ -93,30 +90,6 @@ require('yargs')
       }),
     handler: argv => run.serve(argv.path, argv.open, argv.port, argv.P, argv.i)
   })
-  .command({
-    command: 'start [path]',
-    desc: chalk.gray(y18n.__('start')),
-    builder: yargs =>
-      yargs.options({
-        config: {
-          alias: 'c',
-          default: false,
-          desc: chalk.gray(y18n.__('start.config')),
-          nargs: 1,
-          requiresArg: false,
-          type: 'string'
-        },
-        port: {
-          alias: 'p',
-          default: 4000,
-          desc: chalk.gray(y18n.__('start.port')),
-          nargs: 1,
-          requiresArg: true,
-          type: 'number'
-        }
-      }),
-    handler: argv => run.start(argv.path, argv.config, argv.port)
-  })
   .command({
     command: 'generate [path]',
     aliases: 'g',

lib/commands/init.js

@@ -8,6 +8,7 @@ const logger = require('../util/logger')
 const {prompt, MultiSelect} = require('enquirer')
 const {cwd, exists, pkg, pwd, read, resolve} = require('../util')
 const colors = require('ansi-colors')
+const semver = require('semver')
 
 const replace = function (file, tpl, replace) {
   fs.writeFileSync(file, read(file).replace(tpl, replace), 'utf-8')
@@ -62,10 +63,11 @@ async function createFile(path, local, theme, plugins) {
     const vendor =
       exists(cwd('node_modules/docsify')) || pwd('../node_modules/docsify')
 
-    cp(resolve(vendor, 'lib/docsify.min.js'), target('vendor/docsify.js'))
+    cp(resolve(vendor, 'dist/docsify.min.js'), target('vendor/docsify.js'))
+    cp(resolve(vendor, 'dist/themes/core.css'), target('vendor/themes/core.css'))
     cp(
-      resolve(vendor, `lib/themes/${theme}.css`),
-      target(`vendor/themes/${theme}.css`)
+      resolve(vendor, `dist/themes/addons/${theme}.css`),
+      target(`vendor/themes/addons/${theme}.css`)
     )
   }
 
@@ -75,8 +77,6 @@ async function createFile(path, local, theme, plugins) {
   cp(main, target(filename))
   cp(pwd('template/.nojekyll'), target('.nojekyll'))
 
-  replace(target(filename), 'vue.css', `${theme}.css`)
-
   if (pkg.name) {
     replace(
       target(filename),
@@ -103,14 +103,15 @@ async function createFile(path, local, theme, plugins) {
   }
 
   const officialPlugins = [
-    'front-matter',
-    'search',
     'disqus',
     'emoji',
     'external-script',
+    'front-matter',
     'ga',
     'gitalk',
+    'gtag',
     'matomo',
+    'search',
     'zoom-image'
   ]
 
@@ -146,8 +147,11 @@ async function createFile(path, local, theme, plugins) {
 
   replace(target(filename), '  _plugins_', '_plugin'.repeat(answers.length + 1))
 
+  const {prerelease = [], major} = semver.parse(version) || {}
+  const pluginVersion = prerelease.length ? prerelease[0] : String(major)
+
   answers.forEach(plugin => {
-    const url = `//cdn.jsdelivr.net/npm/docsify@${version[0]}/lib/plugins/${plugin}.min.js`
+    const url = `//cdn.jsdelivr.net/npm/docsify@${pluginVersion}/dist/plugins/${plugin}.min.js`
     replace(target(filename), '_plugin', `  <script src="${url}"></script>\n`)
   })
 

lib/index.js

@@ -1,6 +1,5 @@
 module.exports = {
   init: require('./commands/init'),
   serve: require('./commands/serve'),
-  start: require('./commands/start'),
   generate: require('./commands/generate')
 }

lib/template/index.html

@@ -1,12 +1,12 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
 <head>
-  <meta charset="UTF-8">
+  <meta charset="utf-8">
   <title>Document</title>
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <meta name="description" content="Description">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-  <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/vue.css">
+  <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
+  <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@rc/dist/themes/core.min.css">
+  <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@rc/dist/themes/addons/vue.min.css">
 </head>
 <body>
   <div id="app"></div>
@@ -16,8 +16,8 @@
       repo: ''
     }
   </script>
-  <!-- Docsify v4 -->
-  <script src="//cdn.jsdelivr.net/npm/docsify@4"></script>
+  <!-- Docsify rc -->
+  <script src="//cdn.jsdelivr.net/npm/docsify@rc"></script>
   _plugins_
 </body>
 </html>

lib/template/index.local.html

@@ -1,12 +1,12 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
 <head>
-  <meta charset="UTF-8">
+  <meta charset="utf-8">
   <title>Document</title>
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <meta name="description" content="Description">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-  <link rel="stylesheet" href="vendor/themes/vue.css">
+  <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
+  <link rel="stylesheet" href="vendor/themes/core.min.css">
+  <link rel="stylesheet" href="vendor/themes/addons/vue.min.css">
 </head>
 <body>
   <div id="app"></div>