fix relative path resolution in router and link crawling
This commit is contained in:
		@@ -74,6 +74,10 @@ const BuildArgv = {
 | 
			
		||||
    default: false,
 | 
			
		||||
    describe: "run a local server to live-preview your Quartz",
 | 
			
		||||
  },
 | 
			
		||||
  baseDir: {
 | 
			
		||||
    string: true,
 | 
			
		||||
    describe: "base path to serve your local server on",
 | 
			
		||||
  },
 | 
			
		||||
  port: {
 | 
			
		||||
    number: true,
 | 
			
		||||
    default: 8080,
 | 
			
		||||
@@ -384,19 +388,63 @@ See the [documentation](https://quartz.jzhao.xyz) for how to get started.
 | 
			
		||||
 | 
			
		||||
      await build(clientRefresh)
 | 
			
		||||
      const server = http.createServer(async (req, res) => {
 | 
			
		||||
        await serveHandler(req, res, {
 | 
			
		||||
          public: argv.output,
 | 
			
		||||
          directoryListing: false,
 | 
			
		||||
          trailingSlash: true,
 | 
			
		||||
        })
 | 
			
		||||
        const status = res.statusCode
 | 
			
		||||
        const statusString =
 | 
			
		||||
          status >= 200 && status < 300
 | 
			
		||||
            ? chalk.green(`[${status}]`)
 | 
			
		||||
            : status >= 300 && status < 400
 | 
			
		||||
            ? chalk.yellow(`[${status}]`)
 | 
			
		||||
            : chalk.red(`[${status}]`)
 | 
			
		||||
        console.log(statusString + chalk.grey(` ${req.url}`))
 | 
			
		||||
        const serve = async (fp) => {
 | 
			
		||||
          await serveHandler(req, res, {
 | 
			
		||||
            public: argv.output,
 | 
			
		||||
            directoryListing: false,
 | 
			
		||||
          })
 | 
			
		||||
          const status = res.statusCode
 | 
			
		||||
          const statusString =
 | 
			
		||||
            status >= 200 && status < 300 ? chalk.green(`[${status}]`) : chalk.red(`[${status}]`)
 | 
			
		||||
          console.log(statusString + chalk.grey(` ${req.url}`))
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        const redirect = (newFp) => {
 | 
			
		||||
          res.writeHead(301, {
 | 
			
		||||
            Location: newFp,
 | 
			
		||||
          })
 | 
			
		||||
          console.log(chalk.yellow("[301]") + chalk.grey(` ${req.url} -> ${newFp}`))
 | 
			
		||||
          return res.end()
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        let fp = req.url?.split("?")[0] ?? "/"
 | 
			
		||||
 | 
			
		||||
        // handle redirects
 | 
			
		||||
        if (fp.endsWith("/")) {
 | 
			
		||||
          // /trailing/
 | 
			
		||||
          // 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)
 | 
			
		||||
          }
 | 
			
		||||
 | 
			
		||||
          // does /trailing.html exist? if so, redirect to /trailing
 | 
			
		||||
          let base = fp.slice(0, -1)
 | 
			
		||||
          if (path.extname(base) === "") {
 | 
			
		||||
            base += ".html"
 | 
			
		||||
          }
 | 
			
		||||
          if (fs.existsSync(path.posix.join(argv.output, base))) {
 | 
			
		||||
            return redirect(base)
 | 
			
		||||
          }
 | 
			
		||||
        } else {
 | 
			
		||||
          // /regular
 | 
			
		||||
          // does /regular.html exist? if so, serve it
 | 
			
		||||
          let base = fp
 | 
			
		||||
          if (path.extname(base) === "") {
 | 
			
		||||
            base += ".html"
 | 
			
		||||
          }
 | 
			
		||||
          if (fs.existsSync(path.posix.join(argv.output, base))) {
 | 
			
		||||
            return serve(base)
 | 
			
		||||
          }
 | 
			
		||||
 | 
			
		||||
          // does /regular/index.html exist? if so, redirect to /regular/
 | 
			
		||||
          let indexFp = path.posix.join(fp, "index.html")
 | 
			
		||||
          if (fs.existsSync(path.posix.join(argv.output, indexFp))) {
 | 
			
		||||
            return redirect(fp + "/")
 | 
			
		||||
          }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        return serve(fp)
 | 
			
		||||
      })
 | 
			
		||||
      server.listen(argv.port)
 | 
			
		||||
      console.log(chalk.cyan(`Started a Quartz server listening at http://localhost:${argv.port}`))
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user