From 76c092dcf20959bc52fcb13b28cee50cd4217e40 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 20 Jul 2023 04:59:48 +0000
Subject: [PATCH] add custom.scss

---
 quartz/plugins/index.ts |   91 ++++++++++++++++++++++-----------------------
 1 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/quartz/plugins/index.ts b/quartz/plugins/index.ts
index 0378b1b..5aed207 100644
--- a/quartz/plugins/index.ts
+++ b/quartz/plugins/index.ts
@@ -1,11 +1,10 @@
 import { GlobalConfiguration } from '../cfg'
 import { QuartzComponent } from '../components/types'
 import { StaticResources } from '../resources'
-import { googleFontHref, joinStyles } from '../theme'
+import { joinStyles } from '../theme'
 import { EmitCallback, PluginTypes } from './types'
 import styles from '../styles/base.scss'
-// @ts-ignore
-import spaRouterScript from '../components/scripts/spa.inline'
+import { FilePath, ServerSlug } from '../path'
 
 export type ComponentResources = {
   css: string[],
@@ -13,13 +12,7 @@
   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[] = []
+export function getComponentResources(plugins: PluginTypes): ComponentResources {
   const allComponents: Set<QuartzComponent> = new Set()
   for (const emitter of plugins.emitters) {
     const components = emitter.getQuartzComponents()
@@ -28,54 +21,57 @@
     }
   }
 
-  const componentResources: ComponentResources = {
-    css: [],
-    beforeDOMLoaded: [],
-    afterDOMLoaded: []
+  const componentResources = {
+    css: new Set<string>(),
+    beforeDOMLoaded: new Set<string>(),
+    afterDOMLoaded: new Set<string>()
   }
 
   for (const component of allComponents) {
     const { css, beforeDOMLoaded, afterDOMLoaded } = component
     if (css) {
-      componentResources.css.push(css)
+      componentResources.css.add(css)
     }
     if (beforeDOMLoaded) {
-      componentResources.beforeDOMLoaded.push(beforeDOMLoaded)
+      componentResources.beforeDOMLoaded.add(beforeDOMLoaded)
     }
     if (afterDOMLoaded) {
-      componentResources.afterDOMLoaded.push(afterDOMLoaded)
+      componentResources.afterDOMLoaded.add(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)`
-    )
+  
+  return {
+    css: [...componentResources.css],
+    beforeDOMLoaded: [...componentResources.beforeDOMLoaded],
+    afterDOMLoaded: [...componentResources.afterDOMLoaded]
   }
+}
 
-  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)
-  })
+function joinScripts(scripts: string[]): string {
+  // wrap with iife to prevent scope collision
+  return scripts.map(script => `(function () {${script}})();`).join("\n")
+}
 
-  fps.push("index.css", "prescript.js", "postscript.js")
-  resources.css.push(googleFontHref(cfg.theme))
+export async function emitComponentResources(cfg: GlobalConfiguration, res: ComponentResources, emit: EmitCallback): Promise<FilePath[]> {
+  const fps = await Promise.all([
+    emit({
+      slug: "index" as ServerSlug,
+      ext: ".css",
+      content: joinStyles(cfg.theme, styles, ...res.css)
+    }),
+    emit({
+      slug: "prescript" as ServerSlug,
+      ext: ".js",
+      content: joinScripts(res.beforeDOMLoaded)
+    }),
+    emit({
+      slug: "postscript" as ServerSlug,
+      ext: ".js",
+      content: joinScripts(res.afterDOMLoaded)
+    })
+  ])
   return fps
+
 }
 
 export function getStaticResourcesFromPlugins(plugins: PluginTypes) {
@@ -87,10 +83,10 @@
   for (const transformer of plugins.transformers) {
     const res = transformer.externalResources ? transformer.externalResources() : {}
     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)
     }
   }
 
@@ -104,7 +100,8 @@
 declare module 'vfile' {
   // inserted in processors.ts
   interface DataMap {
-    slug: string
-    filePath: string
+    slug: ServerSlug
+    allSlugs: ServerSlug[]
+    filePath: FilePath
   }
 }

--
Gitblit v1.10.0