From 9a0f20012a8f5051aa2faac62f91dc4f2a38151c Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 02 Aug 2023 07:07:41 +0000
Subject: [PATCH] windows patches
---
quartz/bootstrap-cli.mjs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 475e624..75f646b 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 } from "lightningcss"
const UPSTREAM_NAME = "upstream"
const QUARTZ_SOURCE_BRANCH = "v4-alpha"
@@ -82,8 +83,8 @@
bundleInfo: {
boolean: true,
default: false,
- describe: "show detailed bundle information"
- }
+ describe: "show detailed bundle information",
+ },
}
function escapePath(fp) {
@@ -245,8 +246,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) => {
@@ -268,7 +271,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)
@@ -300,6 +303,7 @@
plugins: [
sassPlugin({
type: "css-text",
+ cssImports: true,
}),
{
name: "inline-script-loader",
@@ -339,9 +343,6 @@
.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)
})
@@ -351,9 +352,9 @@
console.log(
`Successfully transpiled ${Object.keys(meta.inputs).length} files (${prettyBytes(
meta.bytes,
- )})`)
- console.log(await esbuild.analyzeMetafile(result.metafile, { color: true })
+ )})`,
)
+ console.log(await esbuild.analyzeMetafile(result.metafile, { color: true }))
}
const { default: buildQuartz } = await import(cacheFile)
--
Gitblit v1.10.0