From 8cf3e3001f2cbd18da73fcc92ae5f4b76d3ecf21 Mon Sep 17 00:00:00 2001
From: Patsagorn Y. <49602385+ptsgrn@users.noreply.github.com>
Date: Thu, 16 Jan 2025 20:44:33 +0000
Subject: [PATCH] feat(i18n): Thai translations (#1722)
---
quartz/cli/handlers.js | 72 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 20 deletions(-)
diff --git a/quartz/cli/handlers.js b/quartz/cli/handlers.js
index 37762a4..6b23d80 100644
--- a/quartz/cli/handlers.js
+++ b/quartz/cli/handlers.js
@@ -15,6 +15,7 @@
import { randomUUID } from "crypto"
import { Mutex } from "async-mutex"
import { CreateArgv } from "./args.js"
+import { globby } from "globby"
import {
exitIfCancel,
escapePath,
@@ -44,7 +45,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 +169,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 +201,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 +237,11 @@
type: "css-text",
cssImports: true,
}),
+ sassPlugin({
+ filter: /\.inline\.scss$/,
+ type: "css",
+ cssImports: true,
+ }),
{
name: "inline-script-loader",
setup(build) {
@@ -258,6 +263,7 @@
},
write: false,
bundle: true,
+ minify: true,
platform: "browser",
format: "esm",
})
@@ -285,8 +291,8 @@
}
if (cleanupBuild) {
- await cleanupBuild()
console.log(chalk.yellow("Detected a source code change, doing a hard rebuild..."))
+ await cleanupBuild()
}
const result = await ctx.rebuild().catch((err) => {
@@ -347,9 +353,18 @@
directoryListing: false,
headers: [
{
- source: "**/*.html",
+ source: "**/*.*",
headers: [{ key: "Content-Disposition", value: "inline" }],
},
+ {
+ source: "**/*.webp",
+ headers: [{ key: "Content-Type", value: "image/webp" }],
+ },
+ // fixes bug where avif images are displayed as text instead of images (future proof)
+ {
+ source: "**/*.avif",
+ headers: [{ key: "Content-Type", value: "image/avif" }],
+ },
],
})
const status = res.statusCode
@@ -418,13 +433,12 @@
),
)
console.log("hint: exit with ctrl+c")
+ const paths = await globby(["**/*.ts", "**/*.tsx", "**/*.scss", "package.json"])
chokidar
- .watch(["**/*.ts", "**/*.tsx", "**/*.scss", "package.json"], {
- ignoreInitial: true,
- })
- .on("all", async () => {
- build(clientRefresh)
- })
+ .watch(paths, { ignoreInitial: true })
+ .on("add", () => build(clientRefresh))
+ .on("change", () => build(clientRefresh))
+ .on("unlink", () => build(clientRefresh))
} else {
await build(() => {})
ctx.dispose()
@@ -450,14 +464,32 @@
try {
gitPull(UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH)
} catch {
- console.log(chalk.red("An error occured above while pulling updates."))
+ console.log(chalk.red("An error occurred above while pulling updates."))
await popContentFolder(contentFolder)
return
}
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 {
@@ -522,7 +554,7 @@
try {
gitPull(ORIGIN_NAME, QUARTZ_SOURCE_BRANCH)
} catch {
- console.log(chalk.red("An error occured above while pulling updates."))
+ console.log(chalk.red("An error occurred above while pulling updates."))
await popContentFolder(contentFolder)
return
}
--
Gitblit v1.10.0