From 3ac6b42e16dca5a44ed3fec2c0314f1dbbc2322b Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 16 Jul 2023 06:02:12 +0000
Subject: [PATCH] finish path refactoring, add sourcemap + better trace support
---
quartz/plugins/index.ts | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/quartz/plugins/index.ts b/quartz/plugins/index.ts
index c55e4dd..5aed207 100644
--- a/quartz/plugins/index.ts
+++ b/quartz/plugins/index.ts
@@ -4,6 +4,7 @@
import { joinStyles } from '../theme'
import { EmitCallback, PluginTypes } from './types'
import styles from '../styles/base.scss'
+import { FilePath, ServerSlug } from '../path'
export type ComponentResources = {
css: string[],
@@ -20,26 +21,30 @@
}
}
- 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)
}
}
-
- return componentResources
+
+ return {
+ css: [...componentResources.css],
+ beforeDOMLoaded: [...componentResources.beforeDOMLoaded],
+ afterDOMLoaded: [...componentResources.afterDOMLoaded]
+ }
}
function joinScripts(scripts: string[]): string {
@@ -47,20 +52,20 @@
return scripts.map(script => `(function () {${script}})();`).join("\n")
}
-export async function emitComponentResources(cfg: GlobalConfiguration, res: ComponentResources, emit: EmitCallback): Promise<string[]> {
+export async function emitComponentResources(cfg: GlobalConfiguration, res: ComponentResources, emit: EmitCallback): Promise<FilePath[]> {
const fps = await Promise.all([
emit({
- slug: "index",
+ slug: "index" as ServerSlug,
ext: ".css",
content: joinStyles(cfg.theme, styles, ...res.css)
}),
emit({
- slug: "prescript",
+ slug: "prescript" as ServerSlug,
ext: ".js",
content: joinScripts(res.beforeDOMLoaded)
}),
emit({
- slug: "postscript",
+ slug: "postscript" as ServerSlug,
ext: ".js",
content: joinScripts(res.afterDOMLoaded)
})
@@ -78,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)
}
}
@@ -95,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