From cbae88fc4e9b98764cfccca2e85f265c4b894573 Mon Sep 17 00:00:00 2001
From: Adam Brangenberg <adambrangenberg@proton.me>
Date: Mon, 31 Jul 2023 04:08:32 +0000
Subject: [PATCH] Removing redundant properties (#356)

---
 quartz/plugins/index.ts |  104 +++++++---------------------------------------------
 1 files changed, 14 insertions(+), 90 deletions(-)

diff --git a/quartz/plugins/index.ts b/quartz/plugins/index.ts
index 0378b1b..23440fb 100644
--- a/quartz/plugins/index.ts
+++ b/quartz/plugins/index.ts
@@ -1,110 +1,34 @@
-import { GlobalConfiguration } from '../cfg'
-import { QuartzComponent } from '../components/types'
-import { StaticResources } from '../resources'
-import { googleFontHref, joinStyles } from '../theme'
-import { EmitCallback, PluginTypes } from './types'
-import styles from '../styles/base.scss'
-// @ts-ignore
-import spaRouterScript from '../components/scripts/spa.inline'
+import { StaticResources } from "../resources"
+import { FilePath, ServerSlug } from "../path"
+import { BuildCtx } from "../ctx"
 
-export type ComponentResources = {
-  css: string[],
-  beforeDOMLoaded: string[],
-  afterDOMLoaded: string[]
-}
-
-function joinScripts(scripts: string[]): string {
-  // wrap with iife to prevent scope collision
-  return scripts.map(script => `(function () {${script}})();`).join("\n")
-}
-
-export function emitComponentResources(cfg: GlobalConfiguration, resources: StaticResources, plugins: PluginTypes, emit: EmitCallback) {
-  const fps: string[] = []
-  const allComponents: Set<QuartzComponent> = new Set()
-  for (const emitter of plugins.emitters) {
-    const components = emitter.getQuartzComponents()
-    for (const component of components) {
-      allComponents.add(component)
-    }
-  }
-
-  const componentResources: ComponentResources = {
-    css: [],
-    beforeDOMLoaded: [],
-    afterDOMLoaded: []
-  }
-
-  for (const component of allComponents) {
-    const { css, beforeDOMLoaded, afterDOMLoaded } = component
-    if (css) {
-      componentResources.css.push(css)
-    }
-    if (beforeDOMLoaded) {
-      componentResources.beforeDOMLoaded.push(beforeDOMLoaded)
-    }
-    if (afterDOMLoaded) {
-      componentResources.afterDOMLoaded.push(afterDOMLoaded)
-    }
-  }
-
-  if (cfg.enableSPA) {
-    componentResources.afterDOMLoaded.push(spaRouterScript)
-  } else {
-    componentResources.afterDOMLoaded.push(`
-      window.spaNavigate = (url, _) => window.location.assign(url)
-      const event = new CustomEvent("nav", { detail: { slug: document.body.dataset.slug } })
-      document.dispatchEvent(event)`
-    )
-  }
-
-  emit({
-    slug: "index",
-    ext: ".css",
-    content: joinStyles(cfg.theme, styles, ...componentResources.css)
-  })
-  emit({
-    slug: "prescript",
-    ext: ".js",
-    content: joinScripts(componentResources.beforeDOMLoaded)
-  })
-  emit({
-    slug: "postscript",
-    ext: ".js",
-    content: joinScripts(componentResources.afterDOMLoaded)
-  })
-
-  fps.push("index.css", "prescript.js", "postscript.js")
-  resources.css.push(googleFontHref(cfg.theme))
-  return fps
-}
-
-export function getStaticResourcesFromPlugins(plugins: PluginTypes) {
+export function getStaticResourcesFromPlugins(ctx: BuildCtx) {
   const staticResources: StaticResources = {
     css: [],
     js: [],
   }
 
-  for (const transformer of plugins.transformers) {
-    const res = transformer.externalResources ? transformer.externalResources() : {}
+  for (const transformer of ctx.cfg.plugins.transformers) {
+    const res = transformer.externalResources ? transformer.externalResources(ctx) : {}
     if (res?.js) {
-      staticResources.js = staticResources.js.concat(res.js)
+      staticResources.js.push(...res.js)
     }
     if (res?.css) {
-      staticResources.css = staticResources.css.concat(res.css)
+      staticResources.css.push(...res.css)
     }
   }
 
   return staticResources
 }
 
-export * from './transformers'
-export * from './filters'
-export * from './emitters'
+export * from "./transformers"
+export * from "./filters"
+export * from "./emitters"
 
-declare module 'vfile' {
+declare module "vfile" {
   // inserted in processors.ts
   interface DataMap {
-    slug: string
-    filePath: string
+    slug: ServerSlug
+    filePath: FilePath
   }
 }

--
Gitblit v1.10.0