fix/feat(fast rebuild): re-render transclusions in normal and fastRebuild mode (#842)
* Re-render transclusions in normal watch mode * Include transclusions in ContentPage getDependencyGraph * Address PR comments
This commit is contained in:
		@@ -1,16 +1,56 @@
 | 
			
		||||
import path from "path"
 | 
			
		||||
import { visit } from "unist-util-visit"
 | 
			
		||||
import { Root } from "hast"
 | 
			
		||||
import { VFile } from "vfile"
 | 
			
		||||
import { QuartzEmitterPlugin } from "../types"
 | 
			
		||||
import { QuartzComponentProps } from "../../components/types"
 | 
			
		||||
import HeaderConstructor from "../../components/Header"
 | 
			
		||||
import BodyConstructor from "../../components/Body"
 | 
			
		||||
import { pageResources, renderPage } from "../../components/renderPage"
 | 
			
		||||
import { FullPageLayout } from "../../cfg"
 | 
			
		||||
import { FilePath, joinSegments, pathToRoot } from "../../util/path"
 | 
			
		||||
import { Argv } from "../../util/ctx"
 | 
			
		||||
import { FilePath, isRelativeURL, joinSegments, pathToRoot } from "../../util/path"
 | 
			
		||||
import { defaultContentPageLayout, sharedPageComponents } from "../../../quartz.layout"
 | 
			
		||||
import { Content } from "../../components"
 | 
			
		||||
import chalk from "chalk"
 | 
			
		||||
import { write } from "./helpers"
 | 
			
		||||
import DepGraph from "../../depgraph"
 | 
			
		||||
 | 
			
		||||
// get all the dependencies for the markdown file
 | 
			
		||||
// eg. images, scripts, stylesheets, transclusions
 | 
			
		||||
const parseDependencies = (argv: Argv, hast: Root, file: VFile): string[] => {
 | 
			
		||||
  const dependencies: string[] = []
 | 
			
		||||
 | 
			
		||||
  visit(hast, "element", (elem): void => {
 | 
			
		||||
    let ref: string | null = null
 | 
			
		||||
 | 
			
		||||
    if (
 | 
			
		||||
      ["script", "img", "audio", "video", "source", "iframe"].includes(elem.tagName) &&
 | 
			
		||||
      elem?.properties?.src
 | 
			
		||||
    ) {
 | 
			
		||||
      ref = elem.properties.src.toString()
 | 
			
		||||
    } else if (["a", "link"].includes(elem.tagName) && elem?.properties?.href) {
 | 
			
		||||
      // transclusions will create a tags with relative hrefs
 | 
			
		||||
      ref = elem.properties.href.toString()
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // if it is a relative url, its a local file and we need to add
 | 
			
		||||
    // it to the dependency graph. otherwise, ignore
 | 
			
		||||
    if (ref === null || !isRelativeURL(ref)) {
 | 
			
		||||
      return
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    let fp = path.join(file.data.filePath!, path.relative(argv.directory, ref)).replace(/\\/g, "/")
 | 
			
		||||
    // markdown files have the .md extension stripped in hrefs, add it back here
 | 
			
		||||
    if (!fp.split("/").pop()?.includes(".")) {
 | 
			
		||||
      fp += ".md"
 | 
			
		||||
    }
 | 
			
		||||
    dependencies.push(fp)
 | 
			
		||||
  })
 | 
			
		||||
 | 
			
		||||
  return dependencies
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export const ContentPage: QuartzEmitterPlugin<Partial<FullPageLayout>> = (userOpts) => {
 | 
			
		||||
  const opts: FullPageLayout = {
 | 
			
		||||
    ...sharedPageComponents,
 | 
			
		||||
@@ -29,13 +69,16 @@ export const ContentPage: QuartzEmitterPlugin<Partial<FullPageLayout>> = (userOp
 | 
			
		||||
      return [Head, Header, Body, ...header, ...beforeBody, pageBody, ...left, ...right, Footer]
 | 
			
		||||
    },
 | 
			
		||||
    async getDependencyGraph(ctx, content, _resources) {
 | 
			
		||||
      // TODO handle transclusions
 | 
			
		||||
      const graph = new DepGraph<FilePath>()
 | 
			
		||||
 | 
			
		||||
      for (const [_tree, file] of content) {
 | 
			
		||||
      for (const [tree, file] of content) {
 | 
			
		||||
        const sourcePath = file.data.filePath!
 | 
			
		||||
        const slug = file.data.slug!
 | 
			
		||||
        graph.addEdge(sourcePath, joinSegments(ctx.argv.output, slug + ".html") as FilePath)
 | 
			
		||||
 | 
			
		||||
        parseDependencies(ctx.argv, tree as Root, file).forEach((dep) => {
 | 
			
		||||
          graph.addEdge(dep as FilePath, sourcePath)
 | 
			
		||||
        })
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      return graph
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user