Skip to content

Commit 8b3679f

Browse files
committed
fix: remove context
1 parent 3a4e31e commit 8b3679f

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

lib/commands/start.js

+17-12
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ var defaultConfig = {
2121
<!--inject-config-->
2222
<script src="//unpkg.com/docsify/lib/docsify.min.js"></script>
2323
</body>
24-
</html>`,
25-
context: './'
24+
</html>`
2625
}
2726

2827
function loadConfig (config) {
@@ -37,13 +36,12 @@ function loadConfig (config) {
3736
module.exports = function (path, configFile, port) {
3837
let config = defaultConfig
3938
const pkg = util.pkg()
40-
let ctx = util.cwd()
39+
let ctx = util.cwd('.')
4140

4241
path = path || './'
4342

4443
if (configFile) {
4544
config = loadConfig(configFile)
46-
ctx = config.context || ctx
4745
config.template = /\.html$/.test(config.template)
4846
? util.read(util.resolve(ctx, config.template))
4947
: config.template
@@ -57,16 +55,23 @@ module.exports = function (path, configFile, port) {
5755
var renderer = new Renderer(Object.assign(defaultConfig, config))
5856
var server = connect()
5957

58+
server.use(serveStatic(path))
6059
server.use(function(req, res) {
61-
renderer.renderToString(req.url)
62-
.then(function (html) {
63-
res.end(html)
64-
})
65-
.catch(function (err) {
66-
res.end(util.read(util.resolve(path, 'index.html')))
67-
})
60+
serveStatic(path)(req, res, function () {
61+
if (/\.(jpg|jpeg|gif|png|svg|ico|mp4|webm|ogg|ogv|js|css|md)(?:\?v=[0-9.]+)?$/.test(req.url)) {
62+
res.writeHead(404)
63+
res.end()
64+
}
65+
renderer.renderToString(req.url)
66+
.then(function (html) {
67+
res.end(html)
68+
})
69+
.catch(function (err) {
70+
res.writeHead(404)
71+
res.end()
72+
})
73+
})
6874
})
69-
server.use(serveStatic(path))
7075
server.listen(port || 4000)
7176

7277
const msg = '\n'

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"connect-livereload": "^0.6.0",
3333
"cp-file": "^4.1.1",
3434
"docsify": ">=3",
35-
"docsify-server-renderer": "^4.0.0",
35+
"docsify-server-renderer": "^4.0.1",
3636
"fs-extra": "^2.1.2",
3737
"livereload": "^0.6.2",
3838
"open": "^0.0.5",

0 commit comments

Comments
 (0)