From 696403d3fa79f79fa3340bb1fe11533d1fdaf0a4 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 13 Mar 2025 17:55:37 +0000
Subject: [PATCH] chore: bump version to 4.4.1
---
quartz/util/path.ts | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/quartz/util/path.ts b/quartz/util/path.ts
index dceb89b..6d99c36 100644
--- a/quartz/util/path.ts
+++ b/quartz/util/path.ts
@@ -1,9 +1,6 @@
import { slug as slugAnchor } from "github-slugger"
import type { Element as HastElement } from "hast"
-import rfdc from "rfdc"
-
-export const clone = rfdc()
-
+import { clone } from "./clone"
// this file must be isomorphic so it can't use node libs (e.g. path)
export const QUARTZ = "quartz"
@@ -39,7 +36,7 @@
export function isRelativeURL(s: string): s is RelativeURL {
const validStart = /^\.{1,2}/.test(s)
const validEnding = !endsWith(s, "index")
- return validStart && validEnding && ![".md", ".html"].includes(_getFileExtension(s) ?? "")
+ return validStart && validEnding && ![".md", ".html"].includes(getFileExtension(s) ?? "")
}
export function getFullSlug(window: Window): FullSlug {
@@ -64,7 +61,7 @@
export function slugifyFilePath(fp: FilePath, excludeExt?: boolean): FullSlug {
fp = stripSlashes(fp) as FilePath
- let ext = _getFileExtension(fp)
+ let ext = getFileExtension(fp)
const withoutFileExt = fp.replace(new RegExp(ext + "$"), "")
if (excludeExt || [".md", ".html", undefined].includes(ext)) {
ext = ""
@@ -108,10 +105,10 @@
el.setAttribute(attr, rebased.pathname + rebased.hash)
}
export function normalizeRelativeURLs(el: Element | Document, destination: string | URL) {
- el.querySelectorAll('[href^="./"], [href^="../"]').forEach((item) =>
+ el.querySelectorAll('[href=""], [href^="./"], [href^="../"]').forEach((item) =>
_rebaseHtmlElement(item, "href", destination),
)
- el.querySelectorAll('[src^="./"], [src^="../"]').forEach((item) =>
+ el.querySelectorAll('[src=""], [src^="./"], [src^="../"]').forEach((item) =>
_rebaseHtmlElement(item, "src", destination),
)
}
@@ -168,6 +165,9 @@
export function splitAnchor(link: string): [string, string] {
let [fp, anchor] = link.split("#", 2)
+ if (fp.endsWith(".pdf")) {
+ return [fp, anchor === undefined ? "" : `#${anchor}`]
+ }
anchor = anchor === undefined ? "" : "#" + slugAnchor(anchor)
return [fp, anchor]
}
@@ -180,10 +180,26 @@
}
export function joinSegments(...args: string[]): string {
- return args
- .filter((segment) => segment !== "")
+ if (args.length === 0) {
+ return ""
+ }
+
+ let joined = args
+ .filter((segment) => segment !== "" && segment !== "/")
+ .map((segment) => stripSlashes(segment))
.join("/")
- .replace(/\/\/+/g, "/")
+
+ // if the first segment starts with a slash, add it back
+ if (args[0].startsWith("/")) {
+ joined = "/" + joined
+ }
+
+ // if the last segment is a folder, add a trailing slash
+ if (args[args.length - 1].endsWith("/")) {
+ joined = joined + "/"
+ }
+
+ return joined
}
export function getAllSegmentPrefixes(tags: string): string[] {
@@ -256,10 +272,10 @@
}
function _hasFileExtension(s: string): boolean {
- return _getFileExtension(s) !== undefined
+ return getFileExtension(s) !== undefined
}
-function _getFileExtension(s: string): string | undefined {
+export function getFileExtension(s: string): string | undefined {
return s.match(/\.[A-Za-z0-9]+$/)?.[0]
}
--
Gitblit v1.10.0