From 264ea3d54438b30bc7d9280e076e3f6e29d0ff8c Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 03 Aug 2023 03:59:56 +0000
Subject: [PATCH] add gitattributes for windows
---
quartz/bootstrap-cli.mjs | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index aa26ffc..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"
@@ -114,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,
@@ -245,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) => {
@@ -268,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)
@@ -300,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",
@@ -339,9 +352,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)
})
--
Gitblit v1.10.0