Compare commits

..

4 Commits

Author SHA1 Message Date
Aaron Pham
7a335c7a5b chore: update in favor of prose
Signed-off-by: Aaron Pham <contact@aarnphm.xyz>
2025-07-08 22:51:47 -04:00
Aaron Pham
863a394a37 Apply suggestion from @jackyzha0
Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>
2025-07-08 22:51:13 -04:00
Aaron Pham
ba2b8bb0c5 Update .github/pull_request_template.md 2025-07-08 16:16:32 -04:00
Aaron Pham
79e7e782ac chore: add PR templates
Signed-off-by: Aaron Pham <contact@aarnphm.xyz>
2025-07-08 15:44:41 -04:00
39 changed files with 648 additions and 1041 deletions

View File

@@ -11,12 +11,12 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Build Preview name: Build Preview
steps: steps:
- uses: actions/checkout@v5 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Setup Node - name: Setup Node
uses: actions/setup-node@v6 uses: actions/setup-node@v4
with: with:
node-version: 22 node-version: 22
@@ -37,7 +37,7 @@ jobs:
run: npx quartz build -d docs -v run: npx quartz build -d docs -v
- name: Upload build artifact - name: Upload build artifact
uses: actions/upload-artifact@v5 uses: actions/upload-artifact@v4
with: with:
name: preview-build name: preview-build
path: public path: public

View File

@@ -19,12 +19,12 @@ jobs:
permissions: permissions:
contents: write contents: write
steps: steps:
- uses: actions/checkout@v5 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Setup Node - name: Setup Node
uses: actions/setup-node@v6 uses: actions/setup-node@v4
with: with:
node-version: 22 node-version: 22
@@ -53,11 +53,11 @@ jobs:
permissions: permissions:
contents: write contents: write
steps: steps:
- uses: actions/checkout@v5 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Setup Node - name: Setup Node
uses: actions/setup-node@v6 uses: actions/setup-node@v4
with: with:
node-version: 22 node-version: 22
- name: Get package version - name: Get package version

View File

@@ -18,7 +18,7 @@ jobs:
name: Deploy Preview to Cloudflare Pages name: Deploy Preview to Cloudflare Pages
steps: steps:
- name: Download build artifact - name: Download build artifact
uses: actions/download-artifact@v6 uses: actions/download-artifact@v4
id: preview-build-artifact id: preview-build-artifact
with: with:
name: preview-build name: preview-build

View File

@@ -21,11 +21,11 @@ jobs:
echo "OWNER_LOWERCASE=${OWNER,,}" >> ${GITHUB_ENV} echo "OWNER_LOWERCASE=${OWNER,,}" >> ${GITHUB_ENV}
env: env:
OWNER: "${{ github.repository_owner }}" OWNER: "${{ github.repository_owner }}"
- uses: actions/checkout@v5 - uses: actions/checkout@v4
with: with:
fetch-depth: 1 fetch-depth: 1
- name: Inject slug/short variables - name: Inject slug/short variables
uses: rlespinasse/github-slug-action@v5.3.0 uses: rlespinasse/github-slug-action@v5.1.0
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx - name: Set up Docker Buildx
@@ -37,7 +37,7 @@ jobs:
network=host network=host
- name: Install cosign - name: Install cosign
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
uses: sigstore/cosign-installer@v4.0.0 uses: sigstore/cosign-installer@v3.9.1
- name: Login to GitHub Container Registry - name: Login to GitHub Container Registry
uses: docker/login-action@v3 uses: docker/login-action@v3
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'

View File

@@ -34,9 +34,6 @@ This part of the configuration concerns anything that can affect the whole site.
- `{ provider: 'tinylytics', siteId: '<your-site-id>' }`: use [Tinylytics](https://tinylytics.app/); - `{ provider: 'tinylytics', siteId: '<your-site-id>' }`: use [Tinylytics](https://tinylytics.app/);
- `{ provider: 'cabin' }` or `{ provider: 'cabin', host: 'https://cabin.example.com' }` (custom domain): use [Cabin](https://withcabin.com); - `{ provider: 'cabin' }` or `{ provider: 'cabin', host: 'https://cabin.example.com' }` (custom domain): use [Cabin](https://withcabin.com);
- `{provider: 'clarity', projectId: '<your-clarity-id-code' }`: use [Microsoft clarity](https://clarity.microsoft.com/). The project id can be found on top of the overview page. - `{provider: 'clarity', projectId: '<your-clarity-id-code' }`: use [Microsoft clarity](https://clarity.microsoft.com/). The project id can be found on top of the overview page.
- `{ provider: 'matomo', siteId: '<your-matomo-id-code', host: 'matomo.example.com' }`: use [Matomo](https://matomo.org/), without protocol.
- `{ provider: 'vercel' }`: use [Vercel Web Analytics](https://vercel.com/docs/concepts/analytics).
- `{ provider: 'rybbit', siteId: 'my-rybbit-id' }` (managed) or `{ provider: 'rybbit', siteId: 'my-rybbit-id', host: 'my-rybbit-domain.com' }` (self-hosted) use [Rybbit](https://rybbit.com);
- `locale`: used for [[i18n]] and date formatting - `locale`: used for [[i18n]] and date formatting
- `baseUrl`: this is used for sitemaps and RSS feeds that require an absolute URL to know where the canonical 'home' of your site lives. This is normally the deployed URL of your site (e.g. `quartz.jzhao.xyz` for this site). Do not include the protocol (i.e. `https://`) or any leading or trailing slashes. - `baseUrl`: this is used for sitemaps and RSS feeds that require an absolute URL to know where the canonical 'home' of your site lives. This is normally the deployed URL of your site (e.g. `quartz.jzhao.xyz` for this site). Do not include the protocol (i.e. `https://`) or any leading or trailing slashes.
- This should also include the subpath if you are [[hosting]] on GitHub pages without a custom domain. For example, if my repository is `jackyzha0/quartz`, GitHub pages would deploy to `https://jackyzha0.github.io/quartz` and the `baseUrl` would be `jackyzha0.github.io/quartz`. - This should also include the subpath if you are [[hosting]] on GitHub pages without a custom domain. For example, if my repository is `jackyzha0/quartz`, GitHub pages would deploy to `https://jackyzha0.github.io/quartz` and the `baseUrl` would be `jackyzha0.github.io/quartz`.

View File

@@ -162,7 +162,7 @@ You can access the tags of a file by `node.data.tags`.
Component.Explorer({ Component.Explorer({
filterFn: (node) => { filterFn: (node) => {
// exclude files with the tag "explorerexclude" // exclude files with the tag "explorerexclude"
return node.data?.tags?.includes("explorerexclude") !== true return node.data.tags?.includes("explorerexclude") !== true
}, },
}) })
``` ```

View File

@@ -15,7 +15,7 @@ However, if you'd like to publish your site to the world, you need a way to host
## Cloudflare Pages ## Cloudflare Pages
1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account. 1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
2. In Account Home, select **Compute (Workers)** > **Workers & Pages** > **Create application** > **Pages** > **Connect to Git**. 2. In Account Home, select **Workers & Pages** > **Create application** > **Pages** > **Connect to Git**.
3. Select the new GitHub repository that you created and, in the **Set up builds and deployments** section, provide the following information: 3. Select the new GitHub repository that you created and, in the **Set up builds and deployments** section, provide the following information:
| Configuration option | Value | | Configuration option | Value |

View File

@@ -14,6 +14,10 @@ This plugin accepts the following configuration options:
- `renderEngine`: the engine to use to render LaTeX equations. Can be `"katex"` for [KaTeX](https://katex.org/), `"mathjax"` for [MathJax](https://www.mathjax.org/) [SVG rendering](https://docs.mathjax.org/en/latest/output/svg.html), or `"typst"` for [Typst](https://typst.app/) (a new way to compose LaTeX equation). Defaults to KaTeX. - `renderEngine`: the engine to use to render LaTeX equations. Can be `"katex"` for [KaTeX](https://katex.org/), `"mathjax"` for [MathJax](https://www.mathjax.org/) [SVG rendering](https://docs.mathjax.org/en/latest/output/svg.html), or `"typst"` for [Typst](https://typst.app/) (a new way to compose LaTeX equation). Defaults to KaTeX.
- `customMacros`: custom macros for all LaTeX blocks. It takes the form of a key-value pair where the key is a new command name and the value is the expansion of the macro. For example: `{"\\R": "\\mathbb{R}"}` - `customMacros`: custom macros for all LaTeX blocks. It takes the form of a key-value pair where the key is a new command name and the value is the expansion of the macro. For example: `{"\\R": "\\mathbb{R}"}`
> [!note] Typst support
>
> Currently, typst doesn't support inline-math
## API ## API
- Category: Transformer - Category: Transformer

1108
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -2,7 +2,7 @@
"name": "@jackyzha0/quartz", "name": "@jackyzha0/quartz",
"description": "🌱 publish your digital garden and notes as a website", "description": "🌱 publish your digital garden and notes as a website",
"private": true, "private": true,
"version": "4.5.2", "version": "4.5.1",
"type": "module", "type": "module",
"author": "jackyzha0 <j.zhao2k19@gmail.com>", "author": "jackyzha0 <j.zhao2k19@gmail.com>",
"license": "MIT", "license": "MIT",
@@ -36,35 +36,36 @@
}, },
"dependencies": { "dependencies": {
"@clack/prompts": "^0.11.0", "@clack/prompts": "^0.11.0",
"@floating-ui/dom": "^1.7.4", "@floating-ui/dom": "^1.7.0",
"@myriaddreamin/rehype-typst": "^0.6.0", "@myriaddreamin/rehype-typst": "^0.6.0",
"@napi-rs/simple-git": "0.1.22", "@napi-rs/simple-git": "0.1.19",
"@tweenjs/tween.js": "^25.0.0", "@tweenjs/tween.js": "^25.0.0",
"ansi-truncate": "^1.4.0", "@webgpu/types": "^0.1.61",
"ansi-truncate": "^1.2.0",
"async-mutex": "^0.5.0", "async-mutex": "^0.5.0",
"chokidar": "^4.0.3", "chokidar": "^4.0.3",
"cli-spinner": "^0.2.10", "cli-spinner": "^0.2.10",
"d3": "^7.9.0", "d3": "^7.9.0",
"esbuild-sass-plugin": "^3.3.1", "esbuild-sass-plugin": "^3.3.1",
"flexsearch": "^0.8.205", "flexsearch": "0.7.43",
"github-slugger": "^2.0.0", "github-slugger": "^2.0.0",
"globby": "^15.0.0", "globby": "^14.1.0",
"gray-matter": "^4.0.3", "gray-matter": "^4.0.3",
"hast-util-to-html": "^9.0.5", "hast-util-to-html": "^9.0.5",
"hast-util-to-jsx-runtime": "^2.3.6", "hast-util-to-jsx-runtime": "^2.3.6",
"hast-util-to-string": "^3.0.1", "hast-util-to-string": "^3.0.1",
"is-absolute-url": "^5.0.0", "is-absolute-url": "^4.0.1",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"lightningcss": "^1.30.2", "lightningcss": "^1.30.1",
"mdast-util-find-and-replace": "^3.0.2", "mdast-util-find-and-replace": "^3.0.2",
"mdast-util-to-hast": "^13.2.0", "mdast-util-to-hast": "^13.2.0",
"mdast-util-to-string": "^4.0.0", "mdast-util-to-string": "^4.0.0",
"micromorph": "^0.4.5", "micromorph": "^0.4.5",
"minimatch": "^10.1.1", "minimatch": "^10.0.1",
"pixi.js": "^8.14.0", "pixi.js": "^8.9.2",
"preact": "^10.27.2", "preact": "^10.26.7",
"preact-render-to-string": "^6.6.3", "preact-render-to-string": "^6.5.13",
"pretty-bytes": "^7.1.0", "pretty-bytes": "^7.0.0",
"pretty-time": "^1.1.0", "pretty-time": "^1.1.0",
"reading-time": "^1.5.0", "reading-time": "^1.5.0",
"rehype-autolink-headings": "^7.1.0", "rehype-autolink-headings": "^7.1.0",
@@ -83,9 +84,9 @@
"remark-rehype": "^11.1.2", "remark-rehype": "^11.1.2",
"remark-smartypants": "^3.0.2", "remark-smartypants": "^3.0.2",
"rfdc": "^1.4.1", "rfdc": "^1.4.1",
"satori": "^0.18.3", "satori": "^0.13.1",
"serve-handler": "^6.1.6", "serve-handler": "^6.1.6",
"sharp": "^0.34.4", "sharp": "^0.34.2",
"shiki": "^1.26.2", "shiki": "^1.26.2",
"source-map-support": "^0.5.21", "source-map-support": "^0.5.21",
"to-vfile": "^8.0.0", "to-vfile": "^8.0.0",
@@ -93,22 +94,22 @@
"unified": "^11.0.5", "unified": "^11.0.5",
"unist-util-visit": "^5.0.0", "unist-util-visit": "^5.0.0",
"vfile": "^6.0.3", "vfile": "^6.0.3",
"workerpool": "^10.0.0", "workerpool": "^9.2.0",
"ws": "^8.18.3", "ws": "^8.18.2",
"yargs": "^18.0.0" "yargs": "^18.0.0"
}, },
"devDependencies": { "devDependencies": {
"@types/d3": "^7.4.3", "@types/d3": "^7.4.3",
"@types/hast": "^3.0.4", "@types/hast": "^3.0.4",
"@types/js-yaml": "^4.0.9", "@types/js-yaml": "^4.0.9",
"@types/node": "^24.10.0", "@types/node": "^22.15.23",
"@types/pretty-time": "^1.1.5", "@types/pretty-time": "^1.1.5",
"@types/source-map-support": "^0.5.10", "@types/source-map-support": "^0.5.10",
"@types/ws": "^8.18.1", "@types/ws": "^8.18.1",
"@types/yargs": "^17.0.34", "@types/yargs": "^17.0.33",
"esbuild": "^0.25.12", "esbuild": "^0.25.5",
"prettier": "^3.6.2", "prettier": "^3.5.3",
"tsx": "^4.20.6", "tsx": "^4.19.4",
"typescript": "^5.9.3" "typescript": "^5.8.3"
} }
} }

View File

@@ -151,19 +151,16 @@ async function startWatching(
const changes: ChangeEvent[] = [] const changes: ChangeEvent[] = []
watcher watcher
.on("add", (fp) => { .on("add", (fp) => {
fp = toPosixPath(fp)
if (buildData.ignored(fp)) return if (buildData.ignored(fp)) return
changes.push({ path: fp as FilePath, type: "add" }) changes.push({ path: fp as FilePath, type: "add" })
void rebuild(changes, clientRefresh, buildData) void rebuild(changes, clientRefresh, buildData)
}) })
.on("change", (fp) => { .on("change", (fp) => {
fp = toPosixPath(fp)
if (buildData.ignored(fp)) return if (buildData.ignored(fp)) return
changes.push({ path: fp as FilePath, type: "change" }) changes.push({ path: fp as FilePath, type: "change" })
void rebuild(changes, clientRefresh, buildData) void rebuild(changes, clientRefresh, buildData)
}) })
.on("unlink", (fp) => { .on("unlink", (fp) => {
fp = toPosixPath(fp)
if (buildData.ignored(fp)) return if (buildData.ignored(fp)) return
changes.push({ path: fp as FilePath, type: "delete" }) changes.push({ path: fp as FilePath, type: "delete" })
void rebuild(changes, clientRefresh, buildData) void rebuild(changes, clientRefresh, buildData)

View File

@@ -42,19 +42,6 @@ export type Analytics =
provider: "clarity" provider: "clarity"
projectId?: string projectId?: string
} }
| {
provider: "matomo"
host: string
siteId: string
}
| {
provider: "vercel"
}
| {
provider: "rybbit"
siteId: string
host?: string
}
export interface GlobalConfiguration { export interface GlobalConfiguration {
pageTitle: string pageTitle: string

View File

@@ -55,14 +55,11 @@ export type FolderState = {
collapsed: boolean collapsed: boolean
} }
let numExplorers = 0
export default ((userOpts?: Partial<Options>) => { export default ((userOpts?: Partial<Options>) => {
const opts: Options = { ...defaultOptions, ...userOpts } const opts: Options = { ...defaultOptions, ...userOpts }
const { OverflowList, overflowListAfterDOMLoaded } = OverflowListFactory() const { OverflowList, overflowListAfterDOMLoaded } = OverflowListFactory()
const Explorer: QuartzComponent = ({ cfg, displayClass }: QuartzComponentProps) => { const Explorer: QuartzComponent = ({ cfg, displayClass }: QuartzComponentProps) => {
const id = `explorer-${numExplorers++}`
return ( return (
<div <div
class={classNames(displayClass, "explorer")} class={classNames(displayClass, "explorer")}
@@ -80,7 +77,7 @@ export default ((userOpts?: Partial<Options>) => {
type="button" type="button"
class="explorer-toggle mobile-explorer hide-until-loaded" class="explorer-toggle mobile-explorer hide-until-loaded"
data-mobile={true} data-mobile={true}
aria-controls={id} aria-controls="explorer-content"
> >
<svg <svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
@@ -119,7 +116,7 @@ export default ((userOpts?: Partial<Options>) => {
<polyline points="6 9 12 15 18 9"></polyline> <polyline points="6 9 12 15 18 9"></polyline>
</svg> </svg>
</button> </button>
<div id={id} class="explorer-content" aria-expanded={false} role="group"> <div class="explorer-content" aria-expanded={false}>
<OverflowList class="explorer-ul" /> <OverflowList class="explorer-ul" />
</div> </div>
<template id="template-file"> <template id="template-file">

View File

@@ -12,9 +12,9 @@ const OverflowList = ({
) )
} }
let numLists = 0 let numExplorers = 0
export default () => { export default () => {
const id = `list-${numLists++}` const id = `list-${numExplorers++}`
return { return {
OverflowList: (props: JSX.HTMLAttributes<HTMLUListElement>) => ( OverflowList: (props: JSX.HTMLAttributes<HTMLUListElement>) => (

View File

@@ -20,6 +20,7 @@ export default ((userOpts?: Partial<SearchOptions>) => {
return ( return (
<div class={classNames(displayClass, "search")}> <div class={classNames(displayClass, "search")}>
<button class="search-button"> <button class="search-button">
<p>{i18n(cfg.locale).components.search.title}</p>
<svg role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19.9 19.7"> <svg role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19.9 19.7">
<title>Search</title> <title>Search</title>
<g class="search-path" fill="none"> <g class="search-path" fill="none">
@@ -27,7 +28,6 @@ export default ((userOpts?: Partial<SearchOptions>) => {
<circle cx="8" cy="8" r="7" /> <circle cx="8" cy="8" r="7" />
</g> </g>
</svg> </svg>
<p>{i18n(cfg.locale).components.search.title}</p>
</button> </button>
<div class="search-container"> <div class="search-container">
<div class="search-space"> <div class="search-space">

View File

@@ -17,7 +17,6 @@ const defaultOptions: Options = {
layout: "modern", layout: "modern",
} }
let numTocs = 0
export default ((opts?: Partial<Options>) => { export default ((opts?: Partial<Options>) => {
const layout = opts?.layout ?? defaultOptions.layout const layout = opts?.layout ?? defaultOptions.layout
const { OverflowList, overflowListAfterDOMLoaded } = OverflowListFactory() const { OverflowList, overflowListAfterDOMLoaded } = OverflowListFactory()
@@ -30,13 +29,12 @@ export default ((opts?: Partial<Options>) => {
return null return null
} }
const id = `toc-${numTocs++}`
return ( return (
<div class={classNames(displayClass, "toc")}> <div class={classNames(displayClass, "toc")}>
<button <button
type="button" type="button"
class={fileData.collapseToc ? "collapsed toc-header" : "toc-header"} class={fileData.collapseToc ? "collapsed toc-header" : "toc-header"}
aria-controls={id} aria-controls="toc-content"
aria-expanded={!fileData.collapseToc} aria-expanded={!fileData.collapseToc}
> >
<h3>{i18n(cfg.locale).components.tableOfContents.title}</h3> <h3>{i18n(cfg.locale).components.tableOfContents.title}</h3>
@@ -55,10 +53,7 @@ export default ((opts?: Partial<Options>) => {
<polyline points="6 9 12 15 18 9"></polyline> <polyline points="6 9 12 15 18 9"></polyline>
</svg> </svg>
</button> </button>
<OverflowList <OverflowList class={fileData.collapseToc ? "collapsed toc-content" : "toc-content"}>
id={id}
class={fileData.collapseToc ? "collapsed toc-content" : "toc-content"}
>
{fileData.toc.map((tocEntry) => ( {fileData.toc.map((tocEntry) => (
<li key={tocEntry.slug} class={`depth-${tocEntry.depth}`}> <li key={tocEntry.slug} class={`depth-${tocEntry.depth}`}>
<a href={`#${tocEntry.slug}`} data-for={tocEntry.slug}> <a href={`#${tocEntry.slug}`} data-for={tocEntry.slug}>

View File

@@ -9,7 +9,6 @@ import { visit } from "unist-util-visit"
import { Root, Element, ElementContent } from "hast" import { Root, Element, ElementContent } from "hast"
import { GlobalConfiguration } from "../cfg" import { GlobalConfiguration } from "../cfg"
import { i18n } from "../i18n" import { i18n } from "../i18n"
import { styleText } from "util"
interface RenderComponents { interface RenderComponents {
head: QuartzComponent head: QuartzComponent
@@ -69,7 +68,6 @@ function renderTranscludes(
cfg: GlobalConfiguration, cfg: GlobalConfiguration,
slug: FullSlug, slug: FullSlug,
componentData: QuartzComponentProps, componentData: QuartzComponentProps,
visited: Set<FullSlug>,
) { ) {
// process transcludes in componentData // process transcludes in componentData
visit(root, "element", (node, _index, _parent) => { visit(root, "element", (node, _index, _parent) => {
@@ -78,30 +76,6 @@ function renderTranscludes(
if (classNames.includes("transclude")) { if (classNames.includes("transclude")) {
const inner = node.children[0] as Element const inner = node.children[0] as Element
const transcludeTarget = (inner.properties["data-slug"] ?? slug) as FullSlug const transcludeTarget = (inner.properties["data-slug"] ?? slug) as FullSlug
if (visited.has(transcludeTarget)) {
console.warn(
styleText(
"yellow",
`Warning: Skipping circular transclusion: ${slug} -> ${transcludeTarget}`,
),
)
node.children = [
{
type: "element",
tagName: "p",
properties: { style: "color: var(--secondary);" },
children: [
{
type: "text",
value: `Circular transclusion detected: ${transcludeTarget}`,
},
],
},
]
return
}
visited.add(transcludeTarget)
const page = componentData.allFiles.find((f) => f.slug === transcludeTarget) const page = componentData.allFiles.find((f) => f.slug === transcludeTarget)
if (!page) { if (!page) {
return return
@@ -222,8 +196,7 @@ export function renderPage(
// make a deep copy of the tree so we don't remove the transclusion references // make a deep copy of the tree so we don't remove the transclusion references
// for the file cached in contentMap in build.ts // for the file cached in contentMap in build.ts
const root = clone(componentData.tree) as Root const root = clone(componentData.tree) as Root
const visited = new Set<FullSlug>([slug]) renderTranscludes(root, cfg, slug, componentData)
renderTranscludes(root, cfg, slug, componentData, visited)
// set componentData.tree to the edited html that has transclusions rendered // set componentData.tree to the edited html that has transclusions rendered
componentData.tree = root componentData.tree = root
@@ -258,9 +231,8 @@ export function renderPage(
) )
const lang = componentData.fileData.frontmatter?.lang ?? cfg.locale?.split("-")[0] ?? "en" const lang = componentData.fileData.frontmatter?.lang ?? cfg.locale?.split("-")[0] ?? "en"
const direction = i18n(cfg.locale).direction ?? "ltr"
const doc = ( const doc = (
<html lang={lang} dir={direction}> <html lang={lang}>
<Head {...componentData} /> <Head {...componentData} />
<body data-slug={slug}> <body data-slug={slug}>
<div id="quartz-root" class="page"> <div id="quartz-root" class="page">

View File

@@ -68,6 +68,30 @@ type TweenNode = {
stop: () => void stop: () => void
} }
// workaround for pixijs webgpu issue: https://github.com/pixijs/pixijs/issues/11389
async function determineGraphicsAPI(): Promise<"webgpu" | "webgl"> {
const adapter = await navigator.gpu?.requestAdapter().catch(() => null)
const device = adapter && (await adapter.requestDevice().catch(() => null))
if (!device) {
return "webgl"
}
const canvas = document.createElement("canvas")
const gl =
(canvas.getContext("webgl2") as WebGL2RenderingContext | null) ??
(canvas.getContext("webgl") as WebGLRenderingContext | null)
// we have to return webgl so pixijs automatically falls back to canvas
if (!gl) {
return "webgl"
}
const webglMaxTextures = gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS)
const webgpuMaxTextures = device.limits.maxSampledTexturesPerShaderStage
return webglMaxTextures === webgpuMaxTextures ? "webgpu" : "webgl"
}
async function renderGraph(graph: HTMLElement, fullSlug: FullSlug) { async function renderGraph(graph: HTMLElement, fullSlug: FullSlug) {
const slug = simplifySlug(fullSlug) const slug = simplifySlug(fullSlug)
const visited = getVisited() const visited = getVisited()
@@ -349,6 +373,7 @@ async function renderGraph(graph: HTMLElement, fullSlug: FullSlug) {
tweens.forEach((tween) => tween.stop()) tweens.forEach((tween) => tween.stop())
tweens.clear() tweens.clear()
const pixiPreference = await determineGraphicsAPI()
const app = new Application() const app = new Application()
await app.init({ await app.init({
width, width,
@@ -357,7 +382,7 @@ async function renderGraph(graph: HTMLElement, fullSlug: FullSlug) {
autoStart: false, autoStart: false,
autoDensity: true, autoDensity: true,
backgroundAlpha: 0, backgroundAlpha: 0,
preference: "webgpu", preference: pixiPreference,
resolution: window.devicePixelRatio, resolution: window.devicePixelRatio,
eventMode: "static", eventMode: "static",
}) })

View File

@@ -1,4 +1,4 @@
import FlexSearch, { DefaultDocumentSearchResults } from "flexsearch" import FlexSearch from "flexsearch"
import { ContentDetails } from "../../plugins/emitters/contentIndex" import { ContentDetails } from "../../plugins/emitters/contentIndex"
import { registerEscapeHandler, removeAllChildren } from "./util" import { registerEscapeHandler, removeAllChildren } from "./util"
import { FullSlug, normalizeRelativeURLs, resolveRelative } from "../../util/path" import { FullSlug, normalizeRelativeURLs, resolveRelative } from "../../util/path"
@@ -9,21 +9,15 @@ interface Item {
title: string title: string
content: string content: string
tags: string[] tags: string[]
[key: string]: any
} }
// Can be expanded with things like "term" in the future // Can be expanded with things like "term" in the future
type SearchType = "basic" | "tags" type SearchType = "basic" | "tags"
let searchType: SearchType = "basic" let searchType: SearchType = "basic"
let currentSearchTerm: string = "" let currentSearchTerm: string = ""
const encoder = (str: string) => { const encoder = (str: string) => str.toLowerCase().split(/([^a-z]|[^\x00-\x7F])/)
return str
.toLowerCase()
.split(/\s+/)
.filter((token) => token.length > 0)
}
let index = new FlexSearch.Document<Item>({ let index = new FlexSearch.Document<Item>({
charset: "latin:extra",
encode: encoder, encode: encoder,
document: { document: {
id: "id", id: "id",
@@ -226,7 +220,7 @@ async function setupSearch(searchElement: Element, currentSlug: FullSlug, data:
// If search is active, then we will render the first result and display accordingly // If search is active, then we will render the first result and display accordingly
if (!container.classList.contains("active")) return if (!container.classList.contains("active")) return
if (e.key === "Enter" && !e.isComposing) { if (e.key === "Enter") {
// If result has focus, navigate to that one, otherwise pick first result // If result has focus, navigate to that one, otherwise pick first result
if (results.contains(document.activeElement)) { if (results.contains(document.activeElement)) {
const active = document.activeElement as HTMLInputElement const active = document.activeElement as HTMLInputElement
@@ -403,7 +397,7 @@ async function setupSearch(searchElement: Element, currentSlug: FullSlug, data:
searchLayout.classList.toggle("display-results", currentSearchTerm !== "") searchLayout.classList.toggle("display-results", currentSearchTerm !== "")
searchType = currentSearchTerm.startsWith("#") ? "tags" : "basic" searchType = currentSearchTerm.startsWith("#") ? "tags" : "basic"
let searchResults: DefaultDocumentSearchResults<Item> let searchResults: FlexSearch.SimpleDocumentSearchResultSetUnit[]
if (searchType === "tags") { if (searchType === "tags") {
currentSearchTerm = currentSearchTerm.substring(1).trim() currentSearchTerm = currentSearchTerm.substring(1).trim()
const separatorIndex = currentSearchTerm.indexOf(" ") const separatorIndex = currentSearchTerm.indexOf(" ")
@@ -416,7 +410,7 @@ async function setupSearch(searchElement: Element, currentSlug: FullSlug, data:
// return at least 10000 documents, so it is enough to filter them by tag (implemented in flexsearch) // return at least 10000 documents, so it is enough to filter them by tag (implemented in flexsearch)
limit: Math.max(numSearchResults, 10000), limit: Math.max(numSearchResults, 10000),
index: ["title", "content"], index: ["title", "content"],
tag: { tags: tag }, tag: tag,
}) })
for (let searchResult of searchResults) { for (let searchResult of searchResults) {
searchResult.result = searchResult.result.slice(0, numSearchResults) searchResult.result = searchResult.result.slice(0, numSearchResults)

View File

@@ -133,16 +133,12 @@ button.desktop-explorer {
} }
.folder-outer { .folder-outer {
visibility: collapse;
display: grid; display: grid;
grid-template-rows: 0fr; grid-template-rows: 0fr;
transition-property: grid-template-rows, visibility; transition: grid-template-rows 0.3s ease-in-out;
transition-duration: 0.3s;
transition-timing-function: ease-in-out;
} }
.folder-outer.open { .folder-outer.open {
visibility: visible;
grid-template-rows: 1fr; grid-template-rows: 1fr;
} }

View File

@@ -8,24 +8,24 @@
} }
& > .search-button { & > .search-button {
background-color: transparent; background-color: color-mix(in srgb, var(--lightgray) 60%, var(--light));
border: 1px var(--lightgray) solid; border: none;
border-radius: 4px; border-radius: 4px;
font-family: inherit; font-family: inherit;
font-size: inherit; font-size: inherit;
height: 2rem; height: 2rem;
padding: 0 1rem 0 0; padding: 0;
display: flex; display: flex;
align-items: center; align-items: center;
text-align: inherit; text-align: inherit;
cursor: pointer; cursor: pointer;
white-space: nowrap; white-space: nowrap;
width: 100%; width: 100%;
justify-content: space-between;
& > p { & > p {
display: inline; display: inline;
color: var(--gray); padding: 0 1rem;
text-wrap: unset;
} }
& svg { & svg {
@@ -36,7 +36,7 @@
.search-path { .search-path {
stroke: var(--darkgray); stroke: var(--darkgray);
stroke-width: 1.5px; stroke-width: 2px;
transition: stroke 0.5s ease; transition: stroke 0.5s ease;
} }
} }

View File

@@ -27,8 +27,6 @@ import lt from "./locales/lt-LT"
import fi from "./locales/fi-FI" import fi from "./locales/fi-FI"
import no from "./locales/nb-NO" import no from "./locales/nb-NO"
import id from "./locales/id-ID" import id from "./locales/id-ID"
import kk from "./locales/kk-KZ"
import he from "./locales/he-IL"
export const TRANSLATIONS = { export const TRANSLATIONS = {
"en-US": enUs, "en-US": enUs,
@@ -80,8 +78,6 @@ export const TRANSLATIONS = {
"fi-FI": fi, "fi-FI": fi,
"nb-NO": no, "nb-NO": no,
"id-ID": id, "id-ID": id,
"kk-KZ": kk,
"he-IL": he,
} as const } as const
export const defaultTranslation = "en-US" export const defaultTranslation = "en-US"

View File

@@ -5,7 +5,6 @@ export default {
title: "غير معنون", title: "غير معنون",
description: "لم يتم تقديم أي وصف", description: "لم يتم تقديم أي وصف",
}, },
direction: "rtl" as const,
components: { components: {
callout: { callout: {
note: "ملاحظة", note: "ملاحظة",

View File

@@ -15,7 +15,7 @@ export default {
success: "Erfolg", success: "Erfolg",
question: "Frage", question: "Frage",
warning: "Warnung", warning: "Warnung",
failure: "Fehlgeschlagen", failure: "Misserfolg",
danger: "Gefahr", danger: "Gefahr",
bug: "Fehler", bug: "Fehler",
example: "Beispiel", example: "Beispiel",
@@ -57,7 +57,7 @@ export default {
title: "Inhaltsverzeichnis", title: "Inhaltsverzeichnis",
}, },
contentMeta: { contentMeta: {
readingTime: ({ minutes }) => `${minutes} Min. Lesezeit`, readingTime: ({ minutes }) => `${minutes} min read`,
}, },
}, },
pages: { pages: {
@@ -68,7 +68,7 @@ export default {
error: { error: {
title: "Nicht gefunden", title: "Nicht gefunden",
notFound: "Diese Seite ist entweder nicht öffentlich oder existiert nicht.", notFound: "Diese Seite ist entweder nicht öffentlich oder existiert nicht.",
home: "Zur Startseite", home: "Return to Homepage",
}, },
folderContent: { folderContent: {
folder: "Ordner", folder: "Ordner",

View File

@@ -21,7 +21,6 @@ export interface Translation {
title: string title: string
description: string description: string
} }
direction?: "ltr" | "rtl"
components: { components: {
callout: CalloutTranslation callout: CalloutTranslation
backlinks: { backlinks: {

View File

@@ -5,7 +5,6 @@ export default {
title: "بدون عنوان", title: "بدون عنوان",
description: "توضیح خاصی اضافه نشده است", description: "توضیح خاصی اضافه نشده است",
}, },
direction: "rtl" as const,
components: { components: {
callout: { callout: {
note: "یادداشت", note: "یادداشت",

View File

@@ -1,88 +0,0 @@
import { Translation } from "./definition"
export default {
propertyDefaults: {
title: "ללא כותרת",
description: "לא סופק תיאור",
},
direction: "rtl" as const,
components: {
callout: {
note: "הערה",
abstract: "תקציר",
info: "מידע",
todo: "לעשות",
tip: "טיפ",
success: "הצלחה",
question: "שאלה",
warning: "אזהרה",
failure: "כשלון",
danger: "סכנה",
bug: "באג",
example: "דוגמה",
quote: "ציטוט",
},
backlinks: {
title: "קישורים חוזרים",
noBacklinksFound: "לא נמצאו קישורים חוזרים",
},
themeToggle: {
lightMode: "מצב בהיר",
darkMode: "מצב כהה",
},
readerMode: {
title: "מצב קריאה",
},
explorer: {
title: "סייר",
},
footer: {
createdWith: "נוצר באמצעות",
},
graph: {
title: "מבט גרף",
},
recentNotes: {
title: "הערות אחרונות",
seeRemainingMore: ({ remaining }) => `עיין ב ${remaining} נוספים →`,
},
transcludes: {
transcludeOf: ({ targetSlug }) => `מצוטט מ ${targetSlug}`,
linkToOriginal: "קישור למקורי",
},
search: {
title: "חיפוש",
searchBarPlaceholder: "חפשו משהו",
},
tableOfContents: {
title: "תוכן עניינים",
},
contentMeta: {
readingTime: ({ minutes }) => `${minutes} דקות קריאה`,
},
},
pages: {
rss: {
recentNotes: "הערות אחרונות",
lastFewNotes: ({ count }) => `${count} הערות אחרונות`,
},
error: {
title: "לא נמצא",
notFound: "העמוד הזה פרטי או לא קיים.",
home: "חזרה לעמוד הבית",
},
folderContent: {
folder: "תיקייה",
itemsUnderFolder: ({ count }) =>
count === 1 ? "פריט אחד תחת תיקייה זו." : `${count} פריטים תחת תיקייה זו.`,
},
tagContent: {
tag: "תגית",
tagIndex: "מפתח התגיות",
itemsUnderTag: ({ count }) =>
count === 1 ? "פריט אחד עם תגית זו." : `${count} פריטים עם תגית זו.`,
showingFirst: ({ count }) => `מראה את ה-${count} תגיות הראשונות.`,
totalTags: ({ count }) => `${count} תגיות נמצאו סך הכל.`,
},
},
} as const satisfies Translation

View File

@@ -8,7 +8,7 @@ export default {
components: { components: {
callout: { callout: {
note: "Nota", note: "Nota",
abstract: "Abstract", abstract: "Astratto",
info: "Info", info: "Info",
todo: "Da fare", todo: "Da fare",
tip: "Consiglio", tip: "Consiglio",
@@ -17,7 +17,7 @@ export default {
warning: "Attenzione", warning: "Attenzione",
failure: "Errore", failure: "Errore",
danger: "Pericolo", danger: "Pericolo",
bug: "Problema", bug: "Bug",
example: "Esempio", example: "Esempio",
quote: "Citazione", quote: "Citazione",
}, },
@@ -43,11 +43,10 @@ export default {
}, },
recentNotes: { recentNotes: {
title: "Note recenti", title: "Note recenti",
seeRemainingMore: ({ remaining }) => seeRemainingMore: ({ remaining }) => `Vedi ${remaining} altro →`,
remaining === 1 ? "Vedi 1 altra →" : `Vedi altre ${remaining}`,
}, },
transcludes: { transcludes: {
transcludeOf: ({ targetSlug }) => `Inclusione di ${targetSlug}`, transcludeOf: ({ targetSlug }) => `Transclusione di ${targetSlug}`,
linkToOriginal: "Link all'originale", linkToOriginal: "Link all'originale",
}, },
search: { search: {
@@ -55,16 +54,16 @@ export default {
searchBarPlaceholder: "Cerca qualcosa", searchBarPlaceholder: "Cerca qualcosa",
}, },
tableOfContents: { tableOfContents: {
title: "Indice", title: "Tabella dei contenuti",
}, },
contentMeta: { contentMeta: {
readingTime: ({ minutes }) => (minutes === 1 ? "1 minuto" : `${minutes} minuti`), readingTime: ({ minutes }) => `${minutes} minuti`,
}, },
}, },
pages: { pages: {
rss: { rss: {
recentNotes: "Note recenti", recentNotes: "Note recenti",
lastFewNotes: ({ count }) => (count === 1 ? "Ultima nota" : `Ultime ${count} note`), lastFewNotes: ({ count }) => `Ultime ${count} note`,
}, },
error: { error: {
title: "Non trovato", title: "Non trovato",
@@ -81,9 +80,8 @@ export default {
tagIndex: "Indice etichette", tagIndex: "Indice etichette",
itemsUnderTag: ({ count }) => itemsUnderTag: ({ count }) =>
count === 1 ? "1 oggetto con questa etichetta." : `${count} oggetti con questa etichetta.`, count === 1 ? "1 oggetto con questa etichetta." : `${count} oggetti con questa etichetta.`,
showingFirst: ({ count }) => (count === 1 ? "Prima etichetta." : `Prime ${count} etichette.`), showingFirst: ({ count }) => `Prime ${count} etichette.`,
totalTags: ({ count }) => totalTags: ({ count }) => `Trovate ${count} etichette totali.`,
count === 1 ? "Trovata 1 etichetta in totale." : `Trovate ${count} etichette totali.`,
}, },
}, },
} as const satisfies Translation } as const satisfies Translation

View File

@@ -1,87 +0,0 @@
import { Translation } from "./definition"
export default {
propertyDefaults: {
title: "Атаусыз",
description: "Сипаттама берілмеген",
},
components: {
callout: {
note: "Ескерту",
abstract: "Аннотация",
info: "Ақпарат",
todo: "Істеу керек",
tip: "Кеңес",
success: "Сәттілік",
question: "Сұрақ",
warning: "Ескерту",
failure: "Қате",
danger: "Қауіп",
bug: "Қате",
example: "Мысал",
quote: "Дәйексөз",
},
backlinks: {
title: "Артқа сілтемелер",
noBacklinksFound: "Артқа сілтемелер табылмады",
},
themeToggle: {
lightMode: "Жарық режимі",
darkMode: "Қараңғы режим",
},
readerMode: {
title: "Оқу режимі",
},
explorer: {
title: "Зерттеуші",
},
footer: {
createdWith: "Құрастырылған құрал:",
},
graph: {
title: "Граф көрінісі",
},
recentNotes: {
title: "Соңғы жазбалар",
seeRemainingMore: ({ remaining }) => `Тағы ${remaining} жазбаны қарау →`,
},
transcludes: {
transcludeOf: ({ targetSlug }) => `${targetSlug} кірістіру`,
linkToOriginal: "Бастапқыға сілтеме",
},
search: {
title: "Іздеу",
searchBarPlaceholder: "Бірдеңе іздеу",
},
tableOfContents: {
title: "Мазмұны",
},
contentMeta: {
readingTime: ({ minutes }) => `${minutes} мин оқу`,
},
},
pages: {
rss: {
recentNotes: "Соңғы жазбалар",
lastFewNotes: ({ count }) => `Соңғы ${count} жазба`,
},
error: {
title: "Табылмады",
notFound: "Бұл бет жеке немесе жоқ болуы мүмкін.",
home: "Басты бетке оралу",
},
folderContent: {
folder: "Қалта",
itemsUnderFolder: ({ count }) =>
count === 1 ? "Бұл қалтада 1 элемент бар." : `Бұл қалтада ${count} элемент бар.`,
},
tagContent: {
tag: "Тег",
tagIndex: "Тегтер индексі",
itemsUnderTag: ({ count }) =>
count === 1 ? "Бұл тегпен 1 элемент." : `Бұл тегпен ${count} элемент.`,
showingFirst: ({ count }) => `Алғашқы ${count} тег көрсетілуде.`,
totalTags: ({ count }) => `Барлығы ${count} тег табылды.`,
},
},
} as const satisfies Translation

View File

@@ -51,7 +51,7 @@ export default {
}, },
search: { search: {
title: "Szukaj", title: "Szukaj",
searchBarPlaceholder: "Wpisz frazę wyszukiwania", searchBarPlaceholder: "Search for something",
}, },
tableOfContents: { tableOfContents: {
title: "Spis treści", title: "Spis treści",

View File

@@ -1,7 +1,7 @@
import { FilePath, joinSegments } from "../../util/path"
import { QuartzEmitterPlugin } from "../types" import { QuartzEmitterPlugin } from "../types"
import { write } from "./helpers" import fs from "fs"
import { styleText } from "util" import { styleText } from "util"
import { FullSlug } from "../../util/path"
export function extractDomainFromBaseUrl(baseUrl: string) { export function extractDomainFromBaseUrl(baseUrl: string) {
const url = new URL(`https://${baseUrl}`) const url = new URL(`https://${baseUrl}`)
@@ -10,25 +10,20 @@ export function extractDomainFromBaseUrl(baseUrl: string) {
export const CNAME: QuartzEmitterPlugin = () => ({ export const CNAME: QuartzEmitterPlugin = () => ({
name: "CNAME", name: "CNAME",
async emit(ctx) { async emit({ argv, cfg }) {
if (!ctx.cfg.configuration.baseUrl) { if (!cfg.configuration.baseUrl) {
console.warn( console.warn(
styleText("yellow", "CNAME emitter requires `baseUrl` to be set in your configuration"), styleText("yellow", "CNAME emitter requires `baseUrl` to be set in your configuration"),
) )
return [] return []
} }
const content = extractDomainFromBaseUrl(ctx.cfg.configuration.baseUrl) const path = joinSegments(argv.output, "CNAME")
const content = extractDomainFromBaseUrl(cfg.configuration.baseUrl)
if (!content) { if (!content) {
return [] return []
} }
await fs.promises.writeFile(path, content)
const path = await write({ return [path] as FilePath[]
ctx,
content,
slug: "CNAME" as FullSlug,
ext: "",
})
return [path]
}, },
async *partialEmit() {}, async *partialEmit() {},
}) })

View File

@@ -201,56 +201,6 @@ function addGlobalPageResources(ctx: BuildCtx, componentResources: ComponentReso
})(window, document, "clarity", "script", "${cfg.analytics.projectId}");\` })(window, document, "clarity", "script", "${cfg.analytics.projectId}");\`
document.head.appendChild(clarityScript) document.head.appendChild(clarityScript)
`) `)
} else if (cfg.analytics?.provider === "matomo") {
componentResources.afterDOMLoaded.push(`
const matomoScript = document.createElement("script");
matomoScript.innerHTML = \`
let _paq = window._paq = window._paq || [];
// Track SPA navigation
// https://developer.matomo.org/guides/spa-tracking
document.addEventListener("nav", () => {
_paq.push(['setCustomUrl', location.pathname]);
_paq.push(['setDocumentTitle', document.title]);
_paq.push(['trackPageView']);
});
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
const u="//${cfg.analytics.host}/";
_paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', ${cfg.analytics.siteId}]);
const d=document, g=d.createElement('script'), s=d.getElementsByTagName
('script')[0];
g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
})();
\`
document.head.appendChild(matomoScript);
`)
} else if (cfg.analytics?.provider === "vercel") {
/**
* script from {@link https://vercel.com/docs/analytics/quickstart?framework=html#add-the-script-tag-to-your-site|Vercel Docs}
*/
componentResources.beforeDOMLoaded.push(`
window.va = window.va || function () { (window.vaq = window.vaq || []).push(arguments); };
`)
componentResources.afterDOMLoaded.push(`
const vercelInsightsScript = document.createElement("script")
vercelInsightsScript.src = "/_vercel/insights/script.js"
vercelInsightsScript.defer = true
document.head.appendChild(vercelInsightsScript)
`)
} else if (cfg.analytics?.provider === "rybbit") {
componentResources.afterDOMLoaded.push(`
const rybbitScript = document.createElement("script");
rybbitScript.src = "${cfg.analytics.host ?? "https://app.rybbit.io"}/api/script.js";
rybbitScript.setAttribute("data-site-id", "${cfg.analytics.siteId}");
rybbitScript.async = true;
rybbitScript.defer = true;
document.head.appendChild(rybbitScript);
`)
} }
if (cfg.enableSPA) { if (cfg.enableSPA) {

View File

@@ -58,7 +58,7 @@ function generateRSSFeed(cfg: GlobalConfiguration, idx: ContentIndexMap, limit?:
<title>${escapeHTML(content.title)}</title> <title>${escapeHTML(content.title)}</title>
<link>https://${joinSegments(base, encodeURI(slug))}</link> <link>https://${joinSegments(base, encodeURI(slug))}</link>
<guid>https://${joinSegments(base, encodeURI(slug))}</guid> <guid>https://${joinSegments(base, encodeURI(slug))}</guid>
<description><![CDATA[ ${content.richContent ?? content.description} ]]></description> <description>${content.richContent ?? content.description}</description>
<pubDate>${content.date?.toUTCString()}</pubDate> <pubDate>${content.date?.toUTCString()}</pubDate>
</item>` </item>`

View File

@@ -103,6 +103,7 @@ export const FrontMatter: QuartzTransformerPlugin<Partial<Options>> = (userOpts)
const created = coalesceAliases(data, ["created", "date"]) const created = coalesceAliases(data, ["created", "date"])
if (created) { if (created) {
data.created = created data.created = created
data.modified ||= created // if modified is not set, use created
} }
const modified = coalesceAliases(data, [ const modified = coalesceAliases(data, [
@@ -112,8 +113,6 @@ export const FrontMatter: QuartzTransformerPlugin<Partial<Options>> = (userOpts)
"last-modified", "last-modified",
]) ])
if (modified) data.modified = modified if (modified) data.modified = modified
data.modified ||= created // if modified is not set, use created
const published = coalesceAliases(data, ["published", "publishDate", "date"]) const published = coalesceAliases(data, ["published", "publishDate", "date"])
if (published) data.published = published if (published) data.published = published

View File

@@ -57,7 +57,7 @@ export const CrawlLinks: QuartzTransformerPlugin<Partial<Options>> = (userOpts)
) { ) {
let dest = node.properties.href as RelativeURL let dest = node.properties.href as RelativeURL
const classes = (node.properties.className ?? []) as string[] const classes = (node.properties.className ?? []) as string[]
const isExternal = isAbsoluteUrl(dest, { httpOnly: false }) const isExternal = isAbsoluteUrl(dest)
classes.push(isExternal ? "external" : "internal") classes.push(isExternal ? "external" : "internal")
if (isExternal && opts.externalLinkIcon) { if (isExternal && opts.externalLinkIcon) {
@@ -99,9 +99,7 @@ export const CrawlLinks: QuartzTransformerPlugin<Partial<Options>> = (userOpts)
} }
// don't process external links or intra-document anchors // don't process external links or intra-document anchors
const isInternal = !( const isInternal = !(isAbsoluteUrl(dest) || dest.startsWith("#"))
isAbsoluteUrl(dest, { httpOnly: false }) || dest.startsWith("#")
)
if (isInternal) { if (isInternal) {
dest = node.properties.href = transformLink( dest = node.properties.href = transformLink(
file.data.slug!, file.data.slug!,
@@ -147,7 +145,7 @@ export const CrawlLinks: QuartzTransformerPlugin<Partial<Options>> = (userOpts)
node.properties.loading = "lazy" node.properties.loading = "lazy"
} }
if (!isAbsoluteUrl(node.properties.src, { httpOnly: false })) { if (!isAbsoluteUrl(node.properties.src)) {
let dest = node.properties.src as RelativeURL let dest = node.properties.src as RelativeURL
dest = node.properties.src = transformLink( dest = node.properties.src = transformLink(
file.data.slug!, file.data.slug!,

View File

@@ -488,7 +488,16 @@ export const ObsidianFlavoredMarkdown: QuartzTransformerPlugin<Partial<Options>>
{ {
data: { hProperties: { className: ["callout-content"] }, hName: "div" }, data: { hProperties: { className: ["callout-content"] }, hName: "div" },
type: "blockquote", type: "blockquote",
children: [...calloutContent], children: [
{
data: {
hProperties: { className: ["callout-content-inner"] },
hName: "div",
},
type: "blockquote",
children: [...calloutContent],
},
],
}, },
] ]
} }

View File

@@ -1,6 +1,4 @@
import { QuartzTransformerPlugin } from "../types" import { QuartzTransformerPlugin } from "../types"
import rehypeRaw from "rehype-raw"
import { PluggableList } from "unified"
export interface Options { export interface Options {
/** Replace {{ relref }} with quartz wikilinks []() */ /** Replace {{ relref }} with quartz wikilinks []() */
@@ -104,9 +102,5 @@ export const OxHugoFlavouredMarkdown: QuartzTransformerPlugin<Partial<Options>>
} }
return src return src
}, },
htmlPlugins() {
const plugins: PluggableList = [rehypeRaw]
return plugins
},
} }
} }

View File

@@ -39,13 +39,23 @@ li,
ol, ol,
ul, ul,
.katex, .katex,
.math, .math {
.typst-doc,
.typst-doc * {
color: var(--darkgray); color: var(--darkgray);
fill: var(--darkgray); fill: var(--darkgray);
overflow-wrap: break-word; hyphens: auto;
text-wrap: pretty; }
p,
ul,
text,
a,
li,
ol,
ul,
.katex,
.math {
overflow-wrap: anywhere;
/* tr and td removed from list of selectors for overflow-wrap, allowing them to use default 'normal' property value */
} }
.math { .math {
@@ -211,7 +221,7 @@ a {
} }
& .sidebar { & .sidebar {
gap: 1.2rem; gap: 2rem;
top: 0; top: 0;
box-sizing: border-box; box-sizing: border-box;
padding: $topSpacing 2rem 2rem 2rem; padding: $topSpacing 2rem 2rem 2rem;

View File

@@ -11,11 +11,14 @@
& > .callout-content { & > .callout-content {
display: grid; display: grid;
transition: grid-template-rows 0.1s cubic-bezier(0.02, 0.01, 0.47, 1); transition: grid-template-rows 0.3s ease;
overflow: hidden;
& > :first-child { & > .callout-content-inner {
margin-top: 0; overflow: hidden;
& > :first-child {
margin-top: 0;
}
} }
} }
@@ -118,28 +121,8 @@
--callout-icon: var(--callout-icon-quote); --callout-icon: var(--callout-icon-quote);
} }
&.is-collapsed { &.is-collapsed > .callout-title > .fold-callout-icon {
& > .callout-title > .fold-callout-icon { transform: rotateZ(-90deg);
transform: rotateZ(-90deg);
}
.callout-content {
& > * {
transition:
height 0.1s cubic-bezier(0.02, 0.01, 0.47, 1),
margin 0.1s cubic-bezier(0.02, 0.01, 0.47, 1),
padding 0.1s cubic-bezier(0.02, 0.01, 0.47, 1);
overflow-y: clip;
height: 0;
margin-bottom: 0;
margin-top: 0;
padding-bottom: 0;
padding-top: 0;
}
& > :first-child {
margin-top: -1rem;
}
}
} }
} }