From 56ba2f4fa75c0abe45c231533b5d2edd9791a0ec Mon Sep 17 00:00:00 2001
From: Aaron Pham <contact@aarnphm.xyz>
Date: Fri, 01 Nov 2024 11:16:12 +0000
Subject: [PATCH] feat(build): add support for parsing inline sass (#1558)
---
quartz/cli/handlers.js | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/quartz/cli/handlers.js b/quartz/cli/handlers.js
index 8e32620..5538152 100644
--- a/quartz/cli/handlers.js
+++ b/quartz/cli/handlers.js
@@ -44,7 +44,7 @@
let linkResolutionStrategy = argv.links?.toLowerCase()
const sourceDirectory = argv.source
- // If all cmd arguments were provided, check if theyre valid
+ // If all cmd arguments were provided, check if they're valid
if (setupStrategy && linkResolutionStrategy) {
// If setup isn't, "new", source argument is required
if (setupStrategy !== "new") {
@@ -168,22 +168,20 @@
// get a preferred link resolution strategy
linkResolutionStrategy = exitIfCancel(
await select({
- message: `Choose how Quartz should resolve links in your content. You can change this later in \`quartz.config.ts\`.`,
+ message: `Choose how Quartz should resolve links in your content. This should match Obsidian's link format. You can change this later in \`quartz.config.ts\`.`,
options: [
{
- value: "absolute",
- label: "Treat links as absolute path",
- hint: "for content made for Quartz 3 and Hugo",
- },
- {
value: "shortest",
label: "Treat links as shortest path",
- hint: "for most Obsidian vaults",
+ hint: "(default)",
+ },
+ {
+ value: "absolute",
+ label: "Treat links as absolute path",
},
{
value: "relative",
label: "Treat links as relative paths",
- hint: "for just normal Markdown files",
},
],
}),
@@ -202,6 +200,7 @@
// setup remote
execSync(
`git remote show upstream || git remote add upstream https://github.com/jackyzha0/quartz.git`,
+ { stdio: "ignore" },
)
outro(`You're all set! Not sure what to do next? Try:
@@ -237,6 +236,11 @@
type: "css-text",
cssImports: true,
}),
+ sassPlugin({
+ filter: /\.inline\.scss$/,
+ type: "css",
+ cssImports: true,
+ }),
{
name: "inline-script-loader",
setup(build) {
@@ -348,7 +352,7 @@
directoryListing: false,
headers: [
{
- source: "**/*.html",
+ source: "**/*.*",
headers: [{ key: "Content-Disposition", value: "inline" }],
},
],
@@ -458,7 +462,25 @@
await popContentFolder(contentFolder)
console.log("Ensuring dependencies are up to date")
- const res = spawnSync("npm", ["i"], { stdio: "inherit" })
+
+ /*
+ On Windows, if the command `npm` is really `npm.cmd', this call fails
+ as it will be unable to find `npm`. This is often the case on systems
+ where `npm` is installed via a package manager.
+
+ This means `npx quartz update` will not actually update dependencies
+ on Windows, without a manual `npm i` from the caller.
+
+ However, by spawning a shell, we are able to call `npm.cmd`.
+ See: https://nodejs.org/api/child_process.html#spawning-bat-and-cmd-files-on-windows
+ */
+
+ const opts = { stdio: "inherit" }
+ if (process.platform === "win32") {
+ opts.shell = true
+ }
+
+ const res = spawnSync("npm", ["i"], opts)
if (res.status === 0) {
console.log(chalk.green("Done!"))
} else {
--
Gitblit v1.10.0