update: rc opt

Author: Koooooo-7

lib/cli.js

@@ -5,8 +5,6 @@ const run = require('../lib')
 
 const Locales = require('../tools/locales')
 const y18n = new Locales()
-// Default use the version same to cli
-const docsifyDefaultResourceVersion = pkg.version
 
 require('yargonaut')
   .style('yellow', 'required')
@@ -32,14 +30,13 @@ require('yargs')
           requiresArg: false,
           type: 'boolean'
         },
-        docsifyVersion: {
-          alias: 'ver',
-          default: `${docsifyDefaultResourceVersion}`,
-          desc: chalk.gray(y18n.__('init.version')),
-          choices: [`${docsifyDefaultResourceVersion}`, 'rc'],
-          nargs: 1,
-          requiresArg: true,
-          type: 'string'
+        previewRelease: {
+          alias: 'rc',
+          default: false,
+          desc: chalk.gray(y18n.__('init.rc')),
+          nargs: 0,
+          requiresArg: false,
+          type: 'boolean'
         },
         theme: {
           alias: 't',
@@ -59,7 +56,7 @@ require('yargs')
           type: 'boolean'
         }
       }),
-    handler: argv => run.init(argv.path, argv.local, argv.docsifyVersion, argv.theme, argv.plugins)
+    handler: argv => run.init(argv.path, argv.local, argv.previewRelease, argv.theme, argv.plugins)
   })
   .command({
     command: 'serve [path]',

lib/commands/init.js

@@ -3,6 +3,7 @@
 const fs = require('fs')
 const cp = require('cp-file').sync
 const chalk = require('chalk')
+const {version: cliVerson} = require('../../package.json')
 const logger = require('../util/logger')
 const {prompt, MultiSelect} = require('enquirer')
 const {cwd, exists, pkg, pwd, read, resolve} = require('../util')
@@ -18,10 +19,10 @@ const replaceAll = function (file, tpl, replace) {
 }
 
 // eslint-disable-next-line
-module.exports = async function (path = '', local, docsifyVersion, theme, plugins) {
+module.exports = async function (path = '', local, previewRelease, theme, plugins) {
   const msg =
     '\n' +
-    chalk.green(`Initialization succeeded (${docsifyVersion})!`) +
+    chalk.green('Initialization succeeded!') +
     ' Please run ' +
     chalk.inverse(`docsify serve ${path}`) +
     '\n'
@@ -51,11 +52,11 @@ module.exports = async function (path = '', local, docsifyVersion, theme, plugin
     }
   }
 
-  await createFile(cwdPath, local, docsifyVersion, theme, plugins)
+  await createFile(cwdPath, local, previewRelease, theme, plugins)
   console.log(msg)
 }
 
-async function createFile(path, local, docsifyVersion, theme, plugins) {
+async function createFile(path, local, previewRelease, theme, plugins) {
   const target = file => resolve(path, file)
   const readme = exists(cwd('README.md')) || pwd('template/README.md')
   let main = pwd('template/index.html')
@@ -100,10 +101,11 @@ async function createFile(path, local, docsifyVersion, theme, plugins) {
     replace(target(filename), 'repo: \'\'', `repo: '${repo}'`)
   }
 
-  let resourceVersion = docsifyVersion
-  // Not rc or rc release, fetch the major version
-  if (!(/rc/.test(docsifyVersion))) {
-    resourceVersion = semver.major(docsifyVersion)
+  const {major, prerelease = [], version} = semver.parse(cliVerson) || {}
+  let resourceVersion = prerelease.length ? version : String(major)
+
+  if (previewRelease) {
+    resourceVersion = 'rc'
   }
 
   replaceAll(target(filename), '__docsifyVersion__', `${resourceVersion}`)

tools/locales/de.json

@@ -4,7 +4,7 @@
   "help": "Zeige Hilfe an",
   "init": "Erzeuge neue Dokumentation.",
   "init.local": "Kopiere docsify Dateien in lokale Ordner. Um explizit --local auf false zu setzen, kannst du --no-local verwenden.",
-  "init.version": "Wählen Sie die docsify-Version aus; standardmäßig wird die neueste Version verwendet.",
+  "init.rc": "Probieren Sie die neueste Vorschauversion von docsify aus.",
   "init.theme": "Zu verwendende Theme Dateien.",
   "serve": "Lasse lokalen Server zur Webseitenvorschau laufen.",
   "serve.open": "Dokumentation im Standardbrowser öffnen. Um explizit --open auf false zu setzen, kannst du --no-open verwenden.",

tools/locales/en.json

@@ -4,7 +4,7 @@
   "help": "Show help",
   "init": "Creates new docs",
   "init.local": "Copy docsify files to local. To explicitly set --local to false you may use --no-local.",
-  "init.version": "Select docsify version, default is latest.",
+  "init.rc": "Try docsify preview version, default is marjor.",
   "init.theme": "Theme file to be used.",
   "init.plugins": "A list of plugins to be used.",
   "serve": "Run local server to preview site.",

tools/locales/zh.json

@@ -4,7 +4,7 @@
   "help": "帮助",
   "init": "创建 docs",
   "init.local": "拷贝 docsify 到本地",
-  "init.version": "选择 docsify 版本，默认使用最新版本",
+  "init.rc": "体验 docsify 预览版本，默认使用最新正式版本",
   "init.theme": "选择主题",
   "init.plugins": "选择插件",
   "serve": "本地预览",