From 0c199975f2d469ecdfd7efcf2ddd16ffa1dc492b Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 17 Aug 2023 07:55:28 +0000
Subject: [PATCH] various path fixes for links to extensions, fix relative paths in links
---
quartz/bootstrap-cli.mjs | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 077e31b..8551e76 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -388,7 +388,7 @@
await build(clientRefresh)
const server = http.createServer(async (req, res) => {
- const serve = async (fp) => {
+ const serve = async () => {
await serveHandler(req, res, {
public: argv.output,
directoryListing: false,
@@ -400,11 +400,11 @@
}
const redirect = (newFp) => {
- res.writeHead(301, {
+ res.writeHead(302, {
Location: newFp,
})
- console.log(chalk.yellow("[301]") + chalk.grey(` ${req.url} -> ${newFp}`))
- return res.end()
+ console.log(chalk.yellow("[302]") + chalk.grey(` ${req.url} -> ${newFp}`))
+ res.end()
}
let fp = req.url?.split("?")[0] ?? "/"
@@ -415,7 +415,8 @@
// does /trailing/index.html exist? if so, serve it
const indexFp = path.posix.join(fp, "index.html")
if (fs.existsSync(path.posix.join(argv.output, indexFp))) {
- return serve(indexFp)
+ req.url = fp
+ return serve()
}
// does /trailing.html exist? if so, redirect to /trailing
@@ -424,7 +425,7 @@
base += ".html"
}
if (fs.existsSync(path.posix.join(argv.output, base))) {
- return redirect(base)
+ return redirect(fp.slice(0, -1))
}
} else {
// /regular
@@ -434,7 +435,8 @@
base += ".html"
}
if (fs.existsSync(path.posix.join(argv.output, base))) {
- return serve(base)
+ req.url = fp
+ return serve()
}
// does /regular/index.html exist? if so, redirect to /regular/
@@ -444,7 +446,7 @@
}
}
- return serve(fp)
+ return serve()
})
server.listen(argv.port)
console.log(chalk.cyan(`Started a Quartz server listening at http://localhost:${argv.port}`))
@@ -458,7 +460,7 @@
await build(clientRefresh)
})
} else {
- await build(() => {})
+ await build(() => { })
ctx.dispose()
}
})
--
Gitblit v1.10.0