From 2fdc8129b675d4e9090ba214a5a36646e630c817 Mon Sep 17 00:00:00 2001
From: Michael Thomason <mthomason@gmail.com>
Date: Sat, 01 Nov 2025 10:22:29 +0000
Subject: [PATCH] fix(components): prevent infinite recursion from circular transcludes (#2187)
---
quartz/components/scripts/comments.inline.ts | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/quartz/components/scripts/comments.inline.ts b/quartz/components/scripts/comments.inline.ts
index 4ab29f0..2b876bf 100644
--- a/quartz/components/scripts/comments.inline.ts
+++ b/quartz/components/scripts/comments.inline.ts
@@ -13,7 +13,7 @@
{
giscus: {
setConfig: {
- theme: theme,
+ theme: getThemeUrl(getThemeName(theme)),
},
},
},
@@ -21,16 +21,41 @@
)
}
+const getThemeName = (theme: string) => {
+ if (theme !== "dark" && theme !== "light") {
+ return theme
+ }
+ const giscusContainer = document.querySelector(".giscus") as GiscusElement
+ if (!giscusContainer) {
+ return theme
+ }
+ const darkGiscus = giscusContainer.dataset.darkTheme ?? "dark"
+ const lightGiscus = giscusContainer.dataset.lightTheme ?? "light"
+ return theme === "dark" ? darkGiscus : lightGiscus
+}
+
+const getThemeUrl = (theme: string) => {
+ const giscusContainer = document.querySelector(".giscus") as GiscusElement
+ if (!giscusContainer) {
+ return `https://giscus.app/themes/${theme}.css`
+ }
+ return `${giscusContainer.dataset.themeUrl ?? "https://giscus.app/themes"}/${theme}.css`
+}
+
type GiscusElement = Omit<HTMLElement, "dataset"> & {
dataset: DOMStringMap & {
repo: `${string}/${string}`
repoId: string
category: string
categoryId: string
+ themeUrl: string
+ lightTheme: string
+ darkTheme: string
mapping: "url" | "title" | "og:title" | "specific" | "number" | "pathname"
strict: string
reactionsEnabled: string
inputPosition: "top" | "bottom"
+ lang: string
}
}
@@ -54,10 +79,10 @@
giscusScript.setAttribute("data-strict", giscusContainer.dataset.strict)
giscusScript.setAttribute("data-reactions-enabled", giscusContainer.dataset.reactionsEnabled)
giscusScript.setAttribute("data-input-position", giscusContainer.dataset.inputPosition)
-
+ giscusScript.setAttribute("data-lang", giscusContainer.dataset.lang)
const theme = document.documentElement.getAttribute("saved-theme")
if (theme) {
- giscusScript.setAttribute("data-theme", theme)
+ giscusScript.setAttribute("data-theme", getThemeUrl(getThemeName(theme)))
}
giscusContainer.appendChild(giscusScript)
--
Gitblit v1.10.0