Merge branch 'v4' of https://github.com/jackyzha0/quartz

Author: NESOY

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-lock.json

@@ -60,7 +60,7 @@
     "mdast-util-to-hast": "^13.2.0",
     "mdast-util-to-string": "^4.0.0",
     "micromorph": "^0.4.5",
-    "minimatch": "^10.0.3",
+    "minimatch": "^10.1.1",
     "pixi.js": "^8.14.0",
     "preact": "^10.27.2",
     "preact-render-to-string": "^6.6.3",
@@ -101,12 +101,12 @@
     "@types/d3": "^7.4.3",
     "@types/hast": "^3.0.4",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^24.9.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.34",
-    "esbuild": "^0.25.11",
+    "esbuild": "^0.25.12",
     "prettier": "^3.6.2",
     "tsx": "^4.20.6",
     "typescript": "^5.9.3"

package.json

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

quartz/cfg.ts

@@ -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/renderPage.tsx

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

quartz/components/styles/search.scss

@@ -28,6 +28,7 @@ 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,
@@ -80,6 +81,7 @@ export const TRANSLATIONS = {
   "nb-NO": no,
   "id-ID": id,
   "kk-KZ": kk,
+  "he-IL": he,
 } as const
 
 export const defaultTranslation = "en-US"

quartz/i18n/index.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/he-IL.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,27 +43,28 @@ 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: {
       title: "Cerca",
       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