Jacky Zhao
2023-08-23 b444c5c13b983bf80df8b6d020eb246e9fd3e78e
fix: percent-encoding for files with %, contentIndex for non-latin chars (closes #397, closes #399)
3 files modified
14 ■■■■ changed files
quartz/plugins/emitters/contentIndex.ts 2 ●●● patch | view | raw | blame | history
quartz/plugins/transformers/links.ts 10 ●●●● patch | view | raw | blame | history
quartz/util/path.ts 2 ●●● patch | view | raw | blame | history
quartz/plugins/emitters/contentIndex.ts
@@ -22,7 +22,7 @@
const defaultOptions: Options = {
  enableSiteMap: true,
  enableRSS: true,
  includeEmptyFiles: false,
  includeEmptyFiles: true,
}
function generateSiteMap(cfg: GlobalConfiguration, idx: ContentIndex): string {
quartz/plugins/transformers/links.ts
@@ -60,11 +60,17 @@
                    dest,
                    transformOptions,
                  )
                  const url = new URL(dest, `https://base.com/${curSlug}`)
                  // url.resolve is considered legacy
                  // WHATWG equivalent https://nodejs.dev/en/api/v18/url/#urlresolvefrom-to
                  const url = new URL(dest, `resolve://${curSlug}`)
                  const canonicalDest = url.pathname
                  const [destCanonical, _destAnchor] = splitAnchor(canonicalDest)
                  const simple = decodeURI(simplifySlug(destCanonical as FullSlug)) as SimpleSlug
                  // need to decodeURIComponent here as WHATWG URL percent-encodes everything
                  const simple = decodeURIComponent(
                    simplifySlug(destCanonical as FullSlug),
                  ) as SimpleSlug
                  outgoing.add(simple)
                }
quartz/util/path.ts
@@ -52,7 +52,7 @@
  let slug = withoutFileExt
    .split("/")
    .map((segment) => segment.replace(/\s/g, "-")) // slugify all segments
    .map((segment) => segment.replace(/\s/g, "-").replace(/%/g, "-percent")) // slugify all segments
    .join("/") // always use / as sep
    .replace(/\/$/, "") // remove trailing slash