From e0ebee5aa9b3646de722f139f1d8d15591df538e Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 02 Jul 2023 20:08:29 +0000
Subject: [PATCH] various polish
---
quartz/plugins/index.ts | 58 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/quartz/plugins/index.ts b/quartz/plugins/index.ts
index 30f77e8..c55e4dd 100644
--- a/quartz/plugins/index.ts
+++ b/quartz/plugins/index.ts
@@ -1,7 +1,7 @@
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'
@@ -11,13 +11,8 @@
afterDOMLoaded: string[]
}
-function joinScripts(scripts: string[]): string {
- return scripts.join("\n")
-}
-
-export function emitComponentResources(cfg: GlobalConfiguration, resources: StaticResources, plugins: PluginTypes, emit: EmitCallback) {
- const fps: string[] = []
- const allComponents: Set<QuartzComponent<any>> = new Set()
+export function getComponentResources(plugins: PluginTypes): ComponentResources {
+ const allComponents: Set<QuartzComponent> = new Set()
for (const emitter of plugins.emitters) {
const components = emitter.getQuartzComponents()
for (const component of components) {
@@ -40,29 +35,38 @@
componentResources.beforeDOMLoaded.push(beforeDOMLoaded)
}
if (afterDOMLoaded) {
- componentResources.beforeDOMLoaded.push(afterDOMLoaded)
+ componentResources.afterDOMLoaded.push(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)
- })
+ return componentResources
+}
- fps.push("index.css", "prescript.js", "postscript.js")
- resources.css.push(googleFontHref(cfg.theme))
+function joinScripts(scripts: string[]): string {
+ // wrap with iife to prevent scope collision
+ return scripts.map(script => `(function () {${script}})();`).join("\n")
+}
+
+export async function emitComponentResources(cfg: GlobalConfiguration, res: ComponentResources, emit: EmitCallback): Promise<string[]> {
+ const fps = await Promise.all([
+ emit({
+ slug: "index",
+ ext: ".css",
+ content: joinStyles(cfg.theme, styles, ...res.css)
+ }),
+ emit({
+ slug: "prescript",
+ ext: ".js",
+ content: joinScripts(res.beforeDOMLoaded)
+ }),
+ emit({
+ slug: "postscript",
+ ext: ".js",
+ content: joinScripts(res.afterDOMLoaded)
+ })
+ ])
return fps
+
}
export function getStaticResourcesFromPlugins(plugins: PluginTypes) {
@@ -72,7 +76,7 @@
}
for (const transformer of plugins.transformers) {
- const res = transformer.externalResources
+ const res = transformer.externalResources ? transformer.externalResources() : {}
if (res?.js) {
staticResources.js = staticResources.js.concat(res.js)
}
--
Gitblit v1.10.0