From ebf3263b7efacc9ac499f3f1f1bbc91451899ae0 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 09 Aug 2023 16:10:40 +0000
Subject: [PATCH] update npx quartz update script

---
 quartz/bootstrap-cli.mjs |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 68b9f57..d00a242 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -12,10 +12,10 @@
 import chokidar from "chokidar"
 import prettyBytes from "pretty-bytes"
 import { execSync, spawnSync } from "child_process"
-import { transform as cssTransform } from "lightningcss"
 import http from "http"
 import serveHandler from "serve-handler"
 import { WebSocketServer } from "ws"
+import { randomUUID } from "crypto"
 
 const ORIGIN_NAME = "origin"
 const UPSTREAM_NAME = "upstream"
@@ -84,6 +84,10 @@
     default: false,
     describe: "show detailed bundle information",
   },
+  concurrency: {
+    number: true,
+    describe: "how many threads to use to parse notes",
+  },
 }
 
 function escapePath(fp) {
@@ -125,7 +129,7 @@
 }
 
 function gitPull(origin, branch) {
-  const flags = ["-s", "recursive", "-X", "ours", "--no-edit"]
+  const flags = ["--no-rebase", "--autostash", "-s", "recursive", "-X", "ours", "--no-edit"]
   spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" })
 }
 
@@ -297,7 +301,8 @@
       outfile: path.join("quartz", cacheFile),
       bundle: true,
       keepNames: true,
-      minify: true,
+      minifyWhitespace: true,
+      minifySyntax: true,
       platform: "node",
       format: "esm",
       jsx: "automatic",
@@ -305,18 +310,11 @@
       packages: "external",
       metafile: true,
       sourcemap: true,
+      sourcesContent: false,
       plugins: [
         sassPlugin({
           type: "css-text",
           cssImports: true,
-          async transform(css) {
-            const { code } = cssTransform({
-              filename: "style.css",
-              code: Buffer.from(css),
-              minify: true,
-            })
-            return code.toString()
-          },
         }),
         {
           name: "inline-script-loader",
@@ -372,7 +370,8 @@
       }
 
       // bypass module cache
-      const { default: buildQuartz } = await import(cacheFile + `?update=${new Date()}`)
+      // https://github.com/nodejs/modules/issues/307
+      const { default: buildQuartz } = await import(cacheFile + `?update=${randomUUID()}`)
       await buildQuartz(argv, clientRefresh)
       clientRefresh()
     }

--
Gitblit v1.10.0