Fix optional chaining in tag explorer exclude example (#2200)

Prevents null pointer

.github/workflows/build-preview.yaml

@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Node
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: 22
 
@@ -37,7 +37,7 @@ jobs:
         run: npx quartz build -d docs -v
 
       - name: Upload build artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: preview-build
           path: public

.github/workflows/ci.yaml

@@ -24,7 +24,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Node
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: 22
 
@@ -57,7 +57,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup Node
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: 22
       - name: Get package version

.github/workflows/deploy-preview.yaml

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

.github/workflows/docker-build-push.yaml

@@ -25,7 +25,7 @@ jobs:
         with:
           fetch-depth: 1
       - name: Inject slug/short variables
-        uses: rlespinasse/github-slug-action@v5.2.0
+        uses: rlespinasse/github-slug-action@v5.3.0
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -37,7 +37,7 @@ jobs:
             network=host
       - name: Install cosign
         if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@v3.9.2
+        uses: sigstore/cosign-installer@v4.0.0
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         if: github.event_name != 'pull_request'

docs/configuration.md

@@ -36,6 +36,7 @@ This part of the configuration concerns anything that can affect the whole site.
   - `{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
 - `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`.

docs/features/explorer.md

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

package.json

@@ -48,23 +48,23 @@
     "esbuild-sass-plugin": "^3.3.1",
     "flexsearch": "^0.8.205",
     "github-slugger": "^2.0.0",
-    "globby": "^14.1.0",
+    "globby": "^15.0.0",
     "gray-matter": "^4.0.3",
     "hast-util-to-html": "^9.0.5",
     "hast-util-to-jsx-runtime": "^2.3.6",
     "hast-util-to-string": "^3.0.1",
-    "is-absolute-url": "^4.0.1",
+    "is-absolute-url": "^5.0.0",
     "js-yaml": "^4.1.0",
-    "lightningcss": "^1.30.1",
+    "lightningcss": "^1.30.2",
     "mdast-util-find-and-replace": "^3.0.2",
     "mdast-util-to-hast": "^13.2.0",
     "mdast-util-to-string": "^4.0.0",
     "micromorph": "^0.4.5",
-    "minimatch": "^10.0.3",
-    "pixi.js": "^8.13.1",
-    "preact": "^10.27.1",
-    "preact-render-to-string": "^6.6.1",
-    "pretty-bytes": "^7.0.1",
+    "minimatch": "^10.1.1",
+    "pixi.js": "^8.14.0",
+    "preact": "^10.27.2",
+    "preact-render-to-string": "^6.6.3",
+    "pretty-bytes": "^7.1.0",
     "pretty-time": "^1.1.0",
     "reading-time": "^1.5.0",
     "rehype-autolink-headings": "^7.1.0",
@@ -83,9 +83,9 @@
     "remark-rehype": "^11.1.2",
     "remark-smartypants": "^3.0.2",
     "rfdc": "^1.4.1",
-    "satori": "^0.18.2",
+    "satori": "^0.18.3",
     "serve-handler": "^6.1.6",
-    "sharp": "^0.34.3",
+    "sharp": "^0.34.4",
     "shiki": "^1.26.2",
     "source-map-support": "^0.5.21",
     "to-vfile": "^8.0.0",
@@ -93,7 +93,7 @@
     "unified": "^11.0.5",
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.3",
-    "workerpool": "^9.3.3",
+    "workerpool": "^10.0.0",
     "ws": "^8.18.3",
     "yargs": "^18.0.0"
   },
@@ -101,14 +101,14 @@
     "@types/d3": "^7.4.3",
     "@types/hast": "^3.0.4",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^24.3.1",
+    "@types/node": "^24.10.0",
     "@types/pretty-time": "^1.1.5",
     "@types/source-map-support": "^0.5.10",
     "@types/ws": "^8.18.1",
-    "@types/yargs": "^17.0.33",
-    "esbuild": "^0.25.9",
+    "@types/yargs": "^17.0.34",
+    "esbuild": "^0.25.12",
     "prettier": "^3.6.2",
-    "tsx": "^4.20.5",
-    "typescript": "^5.9.2"
+    "tsx": "^4.20.6",
+    "typescript": "^5.9.3"
   }
 }

quartz/cfg.ts

@@ -50,6 +50,11 @@ export type Analytics =
   | {
       provider: "vercel"
     }
+  | {
+      provider: "rybbit"
+      siteId: string
+      host?: string
+    }
 
 export interface GlobalConfiguration {
   pageTitle: string

quartz/components/renderPage.tsx

@@ -9,6 +9,7 @@ import { visit } from "unist-util-visit"
 import { Root, Element, ElementContent } from "hast"
 import { GlobalConfiguration } from "../cfg"
 import { i18n } from "../i18n"
+import { styleText } from "util"
 
 interface RenderComponents {
   head: QuartzComponent
@@ -68,6 +69,7 @@ function renderTranscludes(
   cfg: GlobalConfiguration,
   slug: FullSlug,
   componentData: QuartzComponentProps,
+  visited: Set<FullSlug>,
 ) {
   // process transcludes in componentData
   visit(root, "element", (node, _index, _parent) => {
@@ -76,6 +78,30 @@ function renderTranscludes(
       if (classNames.includes("transclude")) {
         const inner = node.children[0] as Element
         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)
         if (!page) {
           return
@@ -196,7 +222,8 @@ export function renderPage(
   // make a deep copy of the tree so we don't remove the transclusion references
   // for the file cached in contentMap in build.ts
   const root = clone(componentData.tree) as Root
-  renderTranscludes(root, cfg, slug, componentData)
+  const visited = new Set<FullSlug>([slug])
+  renderTranscludes(root, cfg, slug, componentData, visited)
 
   // set componentData.tree to the edited html that has transclusions rendered
   componentData.tree = root

quartz/components/styles/explorer.scss

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

quartz/components/styles/search.scss

@@ -25,6 +25,7 @@
     & > p {
       display: inline;
       color: var(--gray);
+      text-wrap: unset;
     }
 
     & svg {

quartz/i18n/index.ts

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

quartz/i18n/locales/he-IL.ts

@@ -0,0 +1,88 @@
+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

quartz/i18n/locales/it-IT.ts

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

quartz/i18n/locales/kk-KZ.ts

@@ -0,0 +1,87 @@
+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

quartz/plugins/emitters/componentResources.ts

@@ -241,6 +241,16 @@ function addGlobalPageResources(ctx: BuildCtx, componentResources: ComponentReso
       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) {

quartz/plugins/transformers/frontmatter.ts

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

quartz/plugins/transformers/links.ts

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

quartz/plugins/transformers/oxhugofm.ts

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

quartz/styles/callouts.scss

@@ -123,13 +123,22 @@
       transform: rotateZ(-90deg);
     }
 
-    .callout-content > :first-child {
-      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);
-      overflow-y: clip;
-      height: 0;
-      margin-top: -1rem;
+    .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;
+      }
     }
   }
 }