From 951d1dec24eb8e0bea4ec548cc79c5ce718bf02f Mon Sep 17 00:00:00 2001
From: fl0werpowers <47599466+fl0werpowers@users.noreply.github.com>
Date: Wed, 28 May 2025 08:40:51 +0000
Subject: [PATCH] chore(deps): replace `chalk` and `rimraf` with builtin functions (#1879)
---
quartz/components/scripts/util.ts | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/quartz/components/scripts/util.ts b/quartz/components/scripts/util.ts
index e94929b..f717901 100644
--- a/quartz/components/scripts/util.ts
+++ b/quartz/components/scripts/util.ts
@@ -3,6 +3,7 @@
function click(this: HTMLElement, e: HTMLElementEventMap["click"]) {
if (e.target !== this) return
e.preventDefault()
+ e.stopPropagation()
cb()
}
@@ -12,23 +13,10 @@
cb()
}
- outsideContainer?.removeEventListener("click", click)
outsideContainer?.addEventListener("click", click)
- document.removeEventListener("keydown", esc)
- document.addEventListener('keydown', esc)
-}
-
-export function stripIndex(s: string): string {
- return s.endsWith("index") ? s.slice(0, -"index".length) : s
-}
-
-export function relative(from: string, to: string) {
- from = encodeURI(stripIndex(from))
- to = encodeURI(stripIndex(to))
- const start = [location.protocol, '//', location.host, location.pathname].join('')
- const trimEnd = from.length === 0 ? start.length : -from.length
- const url = start.slice(0, trimEnd) + to
- return url
+ window.addCleanup(() => outsideContainer?.removeEventListener("click", click))
+ document.addEventListener("keydown", esc)
+ window.addCleanup(() => document.removeEventListener("keydown", esc))
}
export function removeAllChildren(node: HTMLElement) {
@@ -36,3 +24,23 @@
node.removeChild(node.firstChild)
}
}
+
+// AliasRedirect emits HTML redirects which also have the link[rel="canonical"]
+// containing the URL it's redirecting to.
+// Extracting it here with regex is _probably_ faster than parsing the entire HTML
+// with a DOMParser effectively twice (here and later in the SPA code), even if
+// way less robust - we only care about our own generated redirects after all.
+const canonicalRegex = /<link rel="canonical" href="([^"]*)">/
+
+export async function fetchCanonical(url: URL): Promise<Response> {
+ const res = await fetch(`${url}`)
+ if (!res.headers.get("content-type")?.startsWith("text/html")) {
+ return res
+ }
+
+ // reading the body can only be done once, so we need to clone the response
+ // to allow the caller to read it if it's was not a redirect
+ const text = await res.clone().text()
+ const [_, redirect] = text.match(canonicalRegex) ?? []
+ return redirect ? fetch(`${new URL(redirect, url)}`) : res
+}
--
Gitblit v1.10.0