From 429f331c212d598b0d7ff44f20f75cf007bcf32b Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 03 Aug 2023 03:53:13 +0000
Subject: [PATCH] make ci also run on windows, re-add css minification
---
quartz/bootstrap-cli.mjs | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index f25484b..0bf27aa 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -11,6 +11,7 @@
import { rimraf } from "rimraf"
import prettyBytes from "pretty-bytes"
import { spawnSync } from "child_process"
+import { transform as cssTransform } from "lightningcss"
const UPSTREAM_NAME = "upstream"
const QUARTZ_SOURCE_BRANCH = "v4-alpha"
@@ -79,6 +80,11 @@
default: 8080,
describe: "port to serve Quartz on",
},
+ bundleInfo: {
+ boolean: true,
+ default: false,
+ describe: "show detailed bundle information",
+ },
}
function escapePath(fp) {
@@ -109,6 +115,7 @@
}
async function popContentFolder(contentFolder) {
+ await fs.promises.rm(contentFolder, { force: true, recursive: true })
await fs.promises.cp(contentCacheFolder, contentFolder, {
force: true,
recursive: true,
@@ -240,8 +247,10 @@
console.log(
"Pulling updates... you may need to resolve some `git` conflicts if you've made changes to components or plugins.",
)
- spawnSync("git", ["pull", UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
+ spawnSync("git", ["rebase", UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
await popContentFolder(contentFolder)
+ console.log("Ensuring dependencies are up to date")
+ spawnSync("npm", ["i"], { stdio: "inherit" })
console.log(chalk.green("Done!"))
})
.command("sync", "Sync your Quartz to and from GitHub.", SyncArgv, async (argv) => {
@@ -263,7 +272,7 @@
console.log(
"Pulling updates from your repository. You may need to resolve some `git` conflicts if you've made changes to components or plugins.",
)
- spawnSync("git", ["pull", "origin", QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
+ spawnSync("git", ["rebase", "origin", QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
}
await popContentFolder(contentFolder)
@@ -284,6 +293,7 @@
outfile: path.join("quartz", cacheFile),
bundle: true,
keepNames: true,
+ minify: true,
platform: "node",
format: "esm",
jsx: "automatic",
@@ -294,6 +304,15 @@
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",
@@ -315,6 +334,7 @@
sourcefile,
},
write: false,
+ minify: true,
bundle: true,
platform: "browser",
format: "esm",
@@ -332,13 +352,10 @@
.catch((err) => {
console.error(`${chalk.red("Couldn't parse Quartz configuration:")} ${fp}`)
console.log(`Reason: ${chalk.grey(err)}`)
- console.log(
- "hint: make sure all the required dependencies are installed (run `npm install`)",
- )
process.exit(1)
})
- if (argv.verbose) {
+ if (argv.bundleInfo) {
const outputFileName = "quartz/.quartz-cache/transpiled-build.mjs"
const meta = result.metafile.outputs[outputFileName]
console.log(
@@ -346,6 +363,7 @@
meta.bytes,
)})`,
)
+ console.log(await esbuild.analyzeMetafile(result.metafile, { color: true }))
}
const { default: buildQuartz } = await import(cacheFile)
--
Gitblit v1.10.0