Skip to content

Commit 084934a

Browse files
sy-recordssy-records
committed
refactor: remove 'start' command and update dependencies for v5.0.0-rc.1
1 parent 29d310a commit 084934a

File tree

13 files changed

+7168
-5856
lines changed

13 files changed

+7168
-5856
lines changed

‎e2e/cli.test.js.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Generated by [AVA](https://avajs.dev).
1313
Commands:␊
1414
docsify init [path] Creates new docs [aliases: i]␊
1515
docsify serve [path] Run local server to preview site. [aliases: s]␊
16-
docsify start [path] Server for SSR␊
1716
docsify generate [path] Docsify's generators [aliases: g]␊
1817
␊
1918
Global Options␊
@@ -38,7 +37,6 @@ Generated by [AVA](https://avajs.dev).
3837
Commands:␊
3938
docsify init [path] Creates new docs [aliases: i]␊
4039
docsify serve [path] Run local server to preview site. [aliases: s]␊
41-
docsify start [path] Server for SSR␊
4240
docsify generate [path] Docsify's generators [aliases: g]␊
4341
␊
4442
Global Options␊
@@ -61,7 +59,6 @@ Generated by [AVA](https://avajs.dev).
6159
Commands:␊
6260
docsify init [path] Creates new docs [aliases: i]␊
6361
docsify serve [path] Run local server to preview site. [aliases: s]␊
64-
docsify start [path] Server for SSR␊
6562
docsify generate [path] Docsify's generators [aliases: g]␊
6663
␊
6764
Global Options␊
@@ -81,7 +78,7 @@ Generated by [AVA](https://avajs.dev).
8178
8279
`␊
8380
docsify-cli version:␊
84-
4.4.4␊
81+
5.0.0-rc.1␊
8582
`
8683

8784
## shows version information with --version flag
@@ -90,7 +87,7 @@ Generated by [AVA](https://avajs.dev).
9087
9188
`␊
9289
docsify-cli version:␊
93-
4.4.4␊
90+
5.0.0-rc.1␊
9491
`
9592

9693
## rejects promise due to error on passing in an unknown command
@@ -102,7 +99,6 @@ Generated by [AVA](https://avajs.dev).
10299
Commands:␊
103100
docsify init [path] Creates new docs [aliases: i]␊
104101
docsify serve [path] Run local server to preview site. [aliases: s]␊
105-
docsify start [path] Server for SSR␊
106102
docsify generate [path] Docsify's generators [aliases: g]␊
107103
␊
108104
Global Options␊

‎e2e/cli.test.js.snap

-4 Bytes
Binary file not shown.

‎lib/cli.js

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require('yargs')
3737
alias: 't',
3838
default: 'vue',
3939
desc: chalk.gray(y18n.__('init.theme')),
40-
choices: ['vue', 'buble', 'dark', 'pure'],
40+
choices: ['vue'],
4141
nargs: 1,
4242
requiresArg: true,
4343
type: 'string'
@@ -93,30 +93,6 @@ require('yargs')
9393
}),
9494
handler: argv => run.serve(argv.path, argv.open, argv.port, argv.P, argv.i)
9595
})
96-
.command({
97-
command: 'start [path]',
98-
desc: chalk.gray(y18n.__('start')),
99-
builder: yargs =>
100-
yargs.options({
101-
config: {
102-
alias: 'c',
103-
default: false,
104-
desc: chalk.gray(y18n.__('start.config')),
105-
nargs: 1,
106-
requiresArg: false,
107-
type: 'string'
108-
},
109-
port: {
110-
alias: 'p',
111-
default: 4000,
112-
desc: chalk.gray(y18n.__('start.port')),
113-
nargs: 1,
114-
requiresArg: true,
115-
type: 'number'
116-
}
117-
}),
118-
handler: argv => run.start(argv.path, argv.config, argv.port)
119-
})
12096
.command({
12197
command: 'generate [path]',
12298
aliases: 'g',

‎lib/commands/init.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const logger = require('../util/logger')
88
const {prompt, MultiSelect} = require('enquirer')
99
const {cwd, exists, pkg, pwd, read, resolve} = require('../util')
1010
const colors = require('ansi-colors')
11+
const semver = require('semver')
1112

1213
const replace = function (file, tpl, replace) {
1314
fs.writeFileSync(file, read(file).replace(tpl, replace), 'utf-8')
@@ -62,10 +63,11 @@ async function createFile(path, local, theme, plugins) {
6263
const vendor =
6364
exists(cwd('node_modules/docsify')) || pwd('../node_modules/docsify')
6465

65-
cp(resolve(vendor, 'lib/docsify.min.js'), target('vendor/docsify.js'))
66+
cp(resolve(vendor, 'dist/docsify.min.js'), target('vendor/docsify.js'))
67+
cp(resolve(vendor, 'dist/themes/core.css'), target('vendor/themes/core.css'))
6668
cp(
67-
resolve(vendor, `lib/themes/${theme}.css`),
68-
target(`vendor/themes/${theme}.css`)
69+
resolve(vendor, `dist/themes/addons/${theme}.css`),
70+
target(`vendor/themes/addons/${theme}.css`)
6971
)
7072
}
7173

@@ -75,8 +77,6 @@ async function createFile(path, local, theme, plugins) {
7577
cp(main, target(filename))
7678
cp(pwd('template/.nojekyll'), target('.nojekyll'))
7779

78-
replace(target(filename), 'vue.css', `${theme}.css`)
79-
8080
if (pkg.name) {
8181
replace(
8282
target(filename),
@@ -103,14 +103,15 @@ async function createFile(path, local, theme, plugins) {
103103
}
104104

105105
const officialPlugins = [
106-
'front-matter',
107-
'search',
108106
'disqus',
109107
'emoji',
110108
'external-script',
109+
'front-matter',
111110
'ga',
112111
'gitalk',
112+
'gtag',
113113
'matomo',
114+
'search',
114115
'zoom-image'
115116
]
116117

@@ -146,8 +147,11 @@ async function createFile(path, local, theme, plugins) {
146147

147148
replace(target(filename), ' _plugins_', '_plugin'.repeat(answers.length + 1))
148149

150+
const {prerelease = [], major} = semver.parse(version) || {}
151+
const pluginVersion = prerelease.length ? prerelease[0] : String(major)
152+
149153
answers.forEach(plugin => {
150-
const url = `//cdn.jsdelivr.net/npm/docsify@${version[0]}/lib/plugins/${plugin}.min.js`
154+
const url = `//cdn.jsdelivr.net/npm/docsify@${pluginVersion}/dist/plugins/${plugin}.min.js`
151155
replace(target(filename), '_plugin', ` <script src="${url}"></script>\n`)
152156
})
153157

‎lib/commands/start.js

Lines changed: 0 additions & 101 deletions
This file was deleted.

‎lib/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module.exports = {
22
init: require('./commands/init'),
33
serve: require('./commands/serve'),
4-
start: require('./commands/start'),
54
generate: require('./commands/generate')
65
}

‎lib/template/index.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<!DOCTYPE html>
2-
<html lang="en">
2+
<html>
33
<head>
4-
<meta charset="UTF-8">
4+
<meta charset="utf-8">
55
<title>Document</title>
6-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
76
<meta name="description" content="Description">
8-
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
9-
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/vue.css">
7+
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
8+
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@rc/dist/themes/core.min.css">
9+
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@rc/dist/themes/addons/vue.min.css">
1010
</head>
1111
<body>
1212
<div id="app"></div>
@@ -16,8 +16,8 @@
1616
repo: ''
1717
}
1818
</script>
19-
<!-- Docsify v4 -->
20-
<script src="//cdn.jsdelivr.net/npm/docsify@4"></script>
19+
<!-- Docsify rc -->
20+
<script src="//cdn.jsdelivr.net/npm/docsify@rc"></script>
2121
_plugins_
2222
</body>
2323
</html>

‎lib/template/index.local.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<!DOCTYPE html>
2-
<html lang="en">
2+
<html>
33
<head>
4-
<meta charset="UTF-8">
4+
<meta charset="utf-8">
55
<title>Document</title>
6-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
76
<meta name="description" content="Description">
8-
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
9-
<link rel="stylesheet" href="vendor/themes/vue.css">
7+
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
8+
<link rel="stylesheet" href="vendor/themes/core.min.css">
9+
<link rel="stylesheet" href="vendor/themes/addons/vue.min.css">
1010
</head>
1111
<body>
1212
<div id="app"></div>

0 commit comments

Comments
 (0)