add git fetch to migration instructions

Jacky Zhao

2023-08-20 90d6c1ed24283d0b046ba7eee2e6533a73cf3683

 quartz/bootstrap-cli.mjs

@@ -19,7 +19,7 @@

const ORIGIN_NAME = "origin"
const UPSTREAM_NAME = "upstream"
const QUARTZ_SOURCE_BRANCH = "v4-alpha"
const QUARTZ_SOURCE_BRANCH = "v4"
const cwd = process.cwd()
const cacheDir = path.join(cwd, ".quartz-cache")
const cacheFile = "./.quartz-cache/transpiled-build.mjs"
@@ -76,6 +76,7 @@
  },
  baseDir: {
    string: true,
    default: "",
    describe: "base path to serve your local server on",
  },
  port: {
@@ -192,7 +193,10 @@

      await rmContentFolder()
      if (setupStrategy === "copy") {
        await fs.promises.cp(originalFolder, contentFolder, { recursive: true })
        await fs.promises.cp(originalFolder, contentFolder, {
          recursive: true,
          preserveTimestamps: true,
        })
      } else if (setupStrategy === "symlink") {
        await fs.promises.symlink(originalFolder, contentFolder, "dir")
      }
@@ -267,6 +271,15 @@
    spawnSync("npm", ["i"], { stdio: "inherit" })
    console.log(chalk.green("Done!"))
  })
  .command(
    "restore",
    "Try to restore your content folder from the cache",
    CommonArgv,
    async (argv) => {
      const contentFolder = path.join(cwd, argv.directory)
      await popContentFolder(contentFolder)
    },
  )
  .command("sync", "Sync your Quartz to and from GitHub.", SyncArgv, async (argv) => {
    const contentFolder = path.join(cwd, argv.directory)
    console.log(chalk.bgGreen.black(`\n Quartz v${version} \n`))
@@ -275,15 +288,14 @@
    if (argv.commit) {
      const contentStat = await fs.promises.lstat(contentFolder)
      if (contentStat.isSymbolicLink()) {
        const linkTarg = await fs.promises.readlink(contentFolder)
        console.log(chalk.yellow("Detected symlink, trying to dereference before committing"))

        // stash symlink file
        await stashContentFolder(contentFolder)

        // follow symlink and copy content
        const linkTarg = await fs.promises.readlink(contentFolder)
        await fs.promises.cp(linkTarg, contentFolder, {
          force: true,
          recursive: true,
          preserveTimestamps: true,
        })
@@ -293,11 +305,12 @@
        dateStyle: "medium",
        timeStyle: "short",
      })
      spawnSync("git", ["commit", "-am", `Quartz sync: ${currentTimestamp}`], { stdio: "inherit" })
      spawnSync("git", ["add", "."], { stdio: "inherit" })
      spawnSync("git", ["commit", "-m", `Quartz sync: ${currentTimestamp}`], { stdio: "inherit" })

      if (contentStat.isSymbolicLink()) {
        // put symlink back
        await popContentFolder()
        await popContentFolder(contentFolder)
      }
    }

@@ -412,8 +425,26 @@
      wss.on("connection", (ws) => connections.push(ws))
      const clientRefresh = () => connections.forEach((conn) => conn.send("rebuild"))

      if (argv.baseDir !== "" && !argv.baseDir.startsWith("/")) {
        argv.baseDir = "/" + argv.baseDir
      }

      await build(clientRefresh)
      const server = http.createServer(async (req, res) => {
        if (argv.baseDir && !req.url?.startsWith(argv.baseDir)) {
          console.log(
            chalk.red(
              `[404] ${req.url} (warning: link outside of site, this is likely a Quartz bug)`,
            ),
          )
          res.writeHead(404)
          res.end()
          return
        }

        // strip baseDir prefix
        req.url = req.url?.slice(argv.baseDir.length)

        const serve = async () => {
          await serveHandler(req, res, {
            public: argv.output,
@@ -422,14 +453,15 @@
          const status = res.statusCode
          const statusString =
            status >= 200 && status < 300 ? chalk.green(`[${status}]`) : chalk.red(`[${status}]`)
          console.log(statusString + chalk.grey(` ${req.url}`))
          console.log(statusString + chalk.grey(` ${argv.baseDir}${req.url}`))
        }

        const redirect = (newFp) => {
          newFp = argv.baseDir + newFp
          res.writeHead(302, {
            Location: newFp,
          })
          console.log(chalk.yellow("[302]") + chalk.grey(` ${req.url} -> ${newFp}`))
          console.log(chalk.yellow("[302]") + chalk.grey(` ${argv.baseDir}${req.url} -> ${newFp}`))
          res.end()
        }

@@ -475,7 +507,11 @@
        return serve()
      })
      server.listen(argv.port)
      console.log(chalk.cyan(`Started a Quartz server listening at http://localhost:${argv.port}`))
      console.log(
        chalk.cyan(
          `Started a Quartz server listening at http://localhost:${argv.port}${argv.baseDir}`,
        ),
      )
      console.log("hint: exit with ctrl+c")
      chokidar
        .watch(["**/*.ts", "**/*.tsx", "**/*.scss", "package.json"], {