From 8bfee04c8c6948a88114d53769d4bb89b8ec7bf5 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sat, 17 Jun 2023 23:05:46 +0000
Subject: [PATCH] popovers
---
quartz/plugins/index.ts | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/quartz/plugins/index.ts b/quartz/plugins/index.ts
index 30f77e8..358c59e 100644
--- a/quartz/plugins/index.ts
+++ b/quartz/plugins/index.ts
@@ -4,6 +4,8 @@
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'
export type ComponentResources = {
css: string[],
@@ -12,12 +14,13 @@
}
function joinScripts(scripts: string[]): string {
- return scripts.join("\n")
+ // 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<any>> = new Set()
+ const allComponents: Set<QuartzComponent> = new Set()
for (const emitter of plugins.emitters) {
const components = emitter.getQuartzComponents()
for (const component of components) {
@@ -40,10 +43,19 @@
componentResources.beforeDOMLoaded.push(beforeDOMLoaded)
}
if (afterDOMLoaded) {
- componentResources.beforeDOMLoaded.push(afterDOMLoaded)
+ componentResources.afterDOMLoaded.push(afterDOMLoaded)
}
}
+ if (cfg.enableSPA) {
+ componentResources.afterDOMLoaded.push(spaRouterScript)
+ } else {
+ componentResources.afterDOMLoaded.push(`
+ const event = new CustomEvent("nav", { detail: { slug: document.body.dataset.slug } })
+ document.dispatchEvent(event)`
+ )
+ }
+
emit({
slug: "index",
ext: ".css",
@@ -72,7 +84,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