DockerFiles/quartz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve path resolution stability

Browse Source
This commit is contained in:
Jacky Zhao 2023-08-19 16:28:44 -07:00
parent c874e7e937
commit dd47be1bc6
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quartz/components/PageList.tsx
View File

@ -56,7 +56,7 @@ export function PageList({ fileData, allFiles, limit }: Props) {
<li>
<a
class="internal tag-link"
href={resolveRelative(fileData.slug!, `tags/${tag}/index` as FullSlug)}
href={resolveRelative(fileData.slug!, `tags/${tag}` as FullSlug)}
>
#{tag}
</a>

4
quartz/components/pages/FolderContent.tsx
View File

@ -5,11 +5,11 @@ import path from "path"
import style from "../styles/listPage.scss"
import { PageList } from "../PageList"
import { simplifySlug } from "../../util/path"
import { _stripSlashes, simplifySlug } from "../../util/path"
function FolderContent(props: QuartzComponentProps) {
const { tree, fileData, allFiles } = props
const folderSlug = simplifySlug(fileData.slug!)
const folderSlug = _stripSlashes(simplifySlug(fileData.slug!))
const allPagesInFolder = allFiles.filter((file) => {
const fileSlug = simplifySlug(file.slug!)
const prefixed = fileSlug.startsWith(folderSlug) && fileSlug !== folderSlug

4
quartz/components/renderPage.tsx
View File

@ -25,7 +25,7 @@ export function pageResources(slug: FullSlug, staticResources: StaticResources):
css: [joinSegments(baseDir, "index.css"), ...staticResources.css],
js: [
{
src: joinSegments(baseDir, "/prescript.js"),
src: joinSegments(baseDir, "prescript.js"),
loadTime: "beforeDOMReady",
contentType: "external",
},
@ -37,7 +37,7 @@ export function pageResources(slug: FullSlug, staticResources: StaticResources):
},
...staticResources.js,
{
src: baseDir + "/postscript.js",
src: joinSegments(baseDir, "postscript.js"),
loadTime: "afterDOMReady",
moduleType: "module",
contentType: "external",

2
quartz/components/scripts/graph.inline.ts
View File

@ -177,7 +177,7 @@ async function renderGraph(container: string, fullSlug: FullSlug) {
window.spaNavigate(new URL(targ, window.location.toString()))
})
.on("mouseover", function (_, d) {
const neighbours: SimpleSlug[] = data[slug].links ?? []
const neighbours: SimpleSlug[] = data[fullSlug].links ?? []
const neighbourNodes = d3
.selectAll<HTMLElement, NodeData>(".node")
.filter((d) => neighbours.includes(d.id))

3
quartz/plugins/transformers/links.ts
View File

@ -60,7 +60,8 @@ export const CrawlLinks: QuartzTransformerPlugin<Partial<Options> | undefined> =
dest,
transformOptions,
)
const canonicalDest = path.posix.normalize(joinSegments(curSlug, dest))
const url = new URL(dest, `https://base.com/${curSlug}`)
const canonicalDest = url.pathname
const [destCanonical, _destAnchor] = splitAnchor(canonicalDest)
const simple = simplifySlug(destCanonical as FullSlug)
outgoing.add(simple)